Fixed style uses as indicated by pep8