Mostly flake8-clean the code