Fixes for pylint and pep8