pep8. Total cleanup