Opinionated code style and whitespace cleanup.