Pep8 cleaning code