refs #10: flake8
refs #10: removed code from other branch, more code cleanup