Refactor action, still have CommandAction left to do
Small fix
Finish refactoring action