Pep8 and cleaning