Whitespace and style clean up