Cleaner command prompt indicator

This patch cleans up the command line prompt considerably.