Update for flake8 compliance