improvement in cli class