search cli: code cleanup