refactored command args