Pep8 clean up