More CLI code cleanup