Refactored actions to be more OO