Apply refactoring actions approach