Fix lint stuff, flake8 now reports no issues