Futher little improvements in cli task1