cleanup according to pep8