Refactor to pep8

#### Make all flakes pass