Misc pep8 cleanup