cleanup, pep8, readability, ...