CliArgs + refactor