Refactor actions style, WIP