Improve cli