Cleanup Cli#start method