refactoring actions