Cleaned up some pep8 issues