Pep8/Pylint style fixes