Fix minor pep8 violations

This is causing issues for #299 and #302