Clean up pep8 errors (still broken)