Polished up the CLI