cleaned up the cli a little