improve CommandLine.