Cleanup from pep8