pep8ify
Fix remaining pep8 errors