cleaned up cli