Minor code refactoring on CliParser