new CLI internals
neater CLI