Refactor inits
Subcommands