Command line: some minor refactoring and improvement [ci skip].
Command line: some minor refactoring and improvement [ci skip].

Fairly/opencor,mirams/opencor,mirams/opencor,mirams/opencor,mirams/opencor,Fairly/opencor,Fairly/opencor,mirams/opencor,Fairly/opencor,Fairly/opencor