Refactor cmd args