Some clean up of the interactive commandline.
Some clean up of the interactive commandline.