Cosmetics and code reformat.