Adding the cluster subcommand and cleaning