Minor style cleanup based on pep8/pylint