Cleaning up pep8