Cleaned up
Fixed code to Flake8 standard