pep8 fix and 2scoops recommendations