minor tweaks in cli code