Fixing pep8
Fixing flakes