Clean up of Subcommand + added CommonList