Refactoring
Fix pylint