Whitespace cleanup and some formatting