Making Code Flake8 Friendly

Making Code Flake8 Friendly