cli code cleanup