Pylint induced refactor