Style changes per pep8 and pylint specs.