Action refactoring to Commands