Improve cli program output