verb and action refactor