Stylistic cleanup from pep8