cleanup how the cli is invoked a bit