Resolve a few pep8 issues