refactor actions
refactor actions