Refactor for action declaration