Making flake8 happy and fixing  to