Try to refactoring code => extract to new class