Updated coverage
Fixes to pep8