A little house cleaning and created cli.