Some flake8 driven tidy ups