Refactor actions -> utils