Clean-up the code using flake8