srevinsaju and quozl PEP8 and Flake8 Fixes