Refactor to pep8

#### Make all flakes pass


This is a bit weird. Could this pull out headers first (similar to data below). That should fit on one line.