Pep8 cleanup