Pylint and Pep8 fixes.