Refactor actions

[cmmorrow]

Is your feature request related to a problem? Please describe.
Code reuse isn't great in the action functions.

Describe the solution you'd like
Refactor some of the action functions to make better use of code reuse.