Whitespace clean up