Improve CLI scaling experience

Closes #257
`const`