Refactor action methods