Reorganize commands in help
Make instantiation_kind an enum class