Whitespace cleanup and some new lines