Improve CLI stuff