Cleaning up with Pep8