Refactoring of actions