Cleaned up some pep8 violations