cleanup / refactoring
cleanup (flake8)