Tune up Cli a bit.