refactor Actions