cleanup / pep8