Whitespace cleanup, no blank lines plz