Refactored the check for the correct commands and options from the cli help output with better naming.
Refactored the check for the correct commands and options from the cli help output with better naming.

Numbluk/baal