Cleaning up ugly whitespace