improve cli