Cleaned up command line ui.