Cleaning up pep8 violations