Small refactoring of actions