Fix spacing
Move model and type to conditional sets since they are optional.