[JBIDE-16354] corrected and cleaned model initialization