Cleaning up for pep8