Make small refactoring in CliCommand class to fix options usability.