Some pep8 cleanup