resolve remaining flake8 issues