Refactoring action class