Partial flake8 cleanup for modified files