Some style and whitespace cleanup