refactor cmd args