Improving CLI script.