Small cleanup and whitespace