Refactored command args to be more helpful.