Refactor Arguments on Commands