Try to refactoring