Fixed up pylint and pep8 errors