Code cleanup for flake8 and coverage reports.