Fix to pass pylint and pep8 tests