Index: vhConsistency/Checks/DOM/PM/SelectieKenmerken.cls.xml
===================================================================
diff -u -r54657 -r54658
--- vhConsistency/Checks/DOM/PM/SelectieKenmerken.cls.xml	(.../SelectieKenmerken.cls.xml)	(revision 54657)
+++ vhConsistency/Checks/DOM/PM/SelectieKenmerken.cls.xml	(.../SelectieKenmerken.cls.xml)	(revision 54658)
@@ -42,15 +42,10 @@
 <Method name="HerberekenStandaardLaden">
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken
-	#dim KlasseInstance As TECH.RegisteredObject
 	#dim ClassDefinition As TECH.ClassInfo.ClassDefinition
 	#dim MethodDefinition As TECH.ClassInfo.MethodDefinition
 	#dim MethodIterator As TECH.Iterator
-	#dim ParameterIterator As TECH.Iterator
-	#dim VerpakkingIterator As TECH.Iterator
-	#dim Verpakking As DOM.PM.enu.LBXVerpakkingType
-	#dim IsMethodPublic, HeeftMethodVerpakkingParameter As %Boolean
+	#dim IsMethodPublic As %Boolean
 	#dim ClassName, MethodName As %String
 		
 	Set ClassName = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken).%ClassName(1)
@@ -62,23 +57,35 @@
 		Set MethodName = MethodDefinition.GeefNaam()
 		Set IsMethodPublic = $$$Not(MethodDefinition.IsPrivate())
 		If (IsMethodPublic && $$$Not(##class(TECH.ListUtils).Contains(..GeefMethodExcludeLijst(), MethodName))) {
-			Set ParameterIterator = MethodDefinition.GeefParameters()
-			If ..HeeftMethodVerpakkingParameter(ParameterIterator) {
-				Set VerpakkingIterator = ##class(DOM.PM.enu.LBXVerpakkingType).ValueListIterator()
-				While VerpakkingIterator.HasNext() {
-					Set Verpakking = VerpakkingIterator.Next()
-					Set IngegevenKenmerken = $ClassMethod(ClassName, MethodName, Verpakking)
-					Do ..Bereken(IngegevenKenmerken, ClassName, MethodName)
-				}
-			} Else {
-				Set IngegevenKenmerken = $ClassMethod(ClassName, MethodName)
-				Do ..Bereken(IngegevenKenmerken, ClassName, MethodName)
-			}
+			Do ..HaalIngegevenKenmerkenOpEnBereken(MethodDefinition, ClassName, MethodName)
 		}
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="HaalIngegevenKenmerkenOpEnBereken">
+<FormalSpec>MethodDefinition:TECH.ClassInfo.MethodDefinition,ClassName:%String,MethodName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken
+	#dim Verpakking As TECH.Enumeration
+	#dim ParameterIterator, VerpakkingIterator As TECH.Iterator
+	
+	Set ParameterIterator = MethodDefinition.GeefParameters()
+	If ..HeeftMethodVerpakkingParameter(ParameterIterator) {
+		Set VerpakkingIterator = ##class(DOM.PM.enu.LBXVerpakkingType).ValueListIterator()
+		While VerpakkingIterator.HasNext() {
+			Set Verpakking = VerpakkingIterator.Next()
+			Set IngegevenKenmerken = $ClassMethod(ClassName, MethodName, Verpakking)
+			Do ..Bereken(IngegevenKenmerken, ClassName, MethodName)
+		}
+	} Else {
+		Set IngegevenKenmerken = $ClassMethod(ClassName, MethodName)
+		Do ..Bereken(IngegevenKenmerken, ClassName, MethodName)
+	}
+]]></Implementation>
+</Method>
+
 <Method name="Bereken">
 <FormalSpec>IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,ClassName:%String,MethodName:%String</FormalSpec>
 <Private>1</Private>
@@ -95,7 +102,6 @@
 		#dim ExceptieData As %String = Exception.GeefErrorInformatie()
 		
 		Do ..VoegMeldingToe(ExceptieData)
-		
 	}
 ]]></Implementation>
 </Method>