A little bit refactoring with the help of Pylint