7.0 pep8

First part of pep8 fixes on repo

Depends on #28