cleanup + pep8