Fix some simple pep8 and pylint violations