Whitespace
Cleanup, pep8