Conformed more to pep8/pylint standards.