diff --git a/generateDS.py b/generateDS.py
index 5acdebfa7886ccfde46a57accad6e293aa3186b2..b88ac014386609078e2adee8864fbc004d58367e 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -3546,11 +3546,13 @@ def generateBuildStandard_1(
     typeName = child.getSimpleType()
     if typeName and typeName in SimpleTypeDict:
         if child.getMaxOccurs() > 1:
-            wrt("            self.validate_%s(self.%s[-1])    # validate type %s\n" % (
-                typeName, mappedName, typeName, ))
+            wrt("            # validate type %s\n" % (typeName, ))
+            wrt("            self.validate_%s(self.%s[-1])\n" % (
+                typeName, mappedName))
         else:
-            wrt("            self.validate_%s(self.%s)    # validate type %s\n" % (
-                typeName, mappedName, typeName, ))
+            wrt("            # validate type %s\n" % (typeName, ))
+            wrt("            self.validate_%s(self.%s)\n" % (
+                typeName, mappedName, ))
 # end generateBuildStandard_1
 
 
diff --git a/tests/anonymous_type1_sup.py b/tests/anonymous_type1_sup.py
index bdb65537a57193bca4379699db3b20cf30ffb6f8..3fbc43e5a17667a638b468ddf25c0b5719784386 100644
--- a/tests/anonymous_type1_sup.py
+++ b/tests/anonymous_type1_sup.py
@@ -832,7 +832,8 @@ class FooType1(GeneratedsSuper):
             FooType_ = child_.text
             FooType_ = self.gds_validate_string(FooType_, node, 'FooType')
             self.FooType = FooType_
-            self.validate_FooTypeType(self.FooType)    # validate type FooTypeType
+            # validate type FooTypeType
+            self.validate_FooTypeType(self.FooType)
 # end class FooType1
 
 
@@ -922,7 +923,8 @@ class BarType2(GeneratedsSuper):
             BarType_ = child_.text
             BarType_ = self.gds_validate_string(BarType_, node, 'BarType')
             self.BarType = BarType_
-            self.validate_BarTypeType(self.BarType)    # validate type BarTypeType
+            # validate type BarTypeType
+            self.validate_BarTypeType(self.BarType)
 # end class BarType2
 
 
@@ -1012,7 +1014,8 @@ class BazType3(GeneratedsSuper):
             BazType_ = child_.text
             BazType_ = self.gds_validate_string(BazType_, node, 'BazType')
             self.BazType = BazType_
-            self.validate_BazTypeType(self.BazType)    # validate type BazTypeType
+            # validate type BazTypeType
+            self.validate_BazTypeType(self.BazType)
 # end class BazType3
 
 
diff --git a/tests/anonymous_type2_sup.py b/tests/anonymous_type2_sup.py
index bdb65537a57193bca4379699db3b20cf30ffb6f8..3fbc43e5a17667a638b468ddf25c0b5719784386 100644
--- a/tests/anonymous_type2_sup.py
+++ b/tests/anonymous_type2_sup.py
@@ -832,7 +832,8 @@ class FooType1(GeneratedsSuper):
             FooType_ = child_.text
             FooType_ = self.gds_validate_string(FooType_, node, 'FooType')
             self.FooType = FooType_
-            self.validate_FooTypeType(self.FooType)    # validate type FooTypeType
+            # validate type FooTypeType
+            self.validate_FooTypeType(self.FooType)
 # end class FooType1
 
 
@@ -922,7 +923,8 @@ class BarType2(GeneratedsSuper):
             BarType_ = child_.text
             BarType_ = self.gds_validate_string(BarType_, node, 'BarType')
             self.BarType = BarType_
-            self.validate_BarTypeType(self.BarType)    # validate type BarTypeType
+            # validate type BarTypeType
+            self.validate_BarTypeType(self.BarType)
 # end class BarType2
 
 
@@ -1012,7 +1014,8 @@ class BazType3(GeneratedsSuper):
             BazType_ = child_.text
             BazType_ = self.gds_validate_string(BazType_, node, 'BazType')
             self.BazType = BazType_
-            self.validate_BazTypeType(self.BazType)    # validate type BazTypeType
+            # validate type BazTypeType
+            self.validate_BazTypeType(self.BazType)
 # end class BazType3
 
 
diff --git a/tests/extensions1_sup.py b/tests/extensions1_sup.py
index bf6517d3bc3639d72714305b969c969de332bc3a..b425326a71bf1d1f0ac464b6b9abcb836a883c6d 100644
--- a/tests/extensions1_sup.py
+++ b/tests/extensions1_sup.py
@@ -1104,7 +1104,8 @@ class simpleFactoidType(GeneratedsSuper):
             relation_ = child_.text
             relation_ = self.gds_validate_string(relation_, node, 'relation')
             self.relation = relation_
-            self.validate_RelationType(self.relation)    # validate type RelationType
+            # validate type RelationType
+            self.validate_RelationType(self.relation)
 # end class simpleFactoidType
 
 
diff --git a/tests/extensions2_sup.py b/tests/extensions2_sup.py
index bf6517d3bc3639d72714305b969c969de332bc3a..b425326a71bf1d1f0ac464b6b9abcb836a883c6d 100644
--- a/tests/extensions2_sup.py
+++ b/tests/extensions2_sup.py
@@ -1104,7 +1104,8 @@ class simpleFactoidType(GeneratedsSuper):
             relation_ = child_.text
             relation_ = self.gds_validate_string(relation_, node, 'relation')
             self.relation = relation_
-            self.validate_RelationType(self.relation)    # validate type RelationType
+            # validate type RelationType
+            self.validate_RelationType(self.relation)
 # end class simpleFactoidType
 
 
diff --git a/tests/out1_sup.py b/tests/out1_sup.py
index 7e6b3b78c3c99aa1404a111dbadc711f9abd2e7e..f653003e495dab78f04da3bb477aa2d0b256e258 100644
--- a/tests/out1_sup.py
+++ b/tests/out1_sup.py
@@ -1815,7 +1815,8 @@ class programmer(person):
             elarraytypes_ = child_.text
             elarraytypes_ = self.gds_validate_string(elarraytypes_, node, 'elarraytypes')
             self.elarraytypes = elarraytypes_
-            self.validate_ArrayTypes(self.elarraytypes)    # validate type ArrayTypes
+            # validate type ArrayTypes
+            self.validate_ArrayTypes(self.elarraytypes)
         super(programmer, self).buildChildren(child_, node, nodeName_, True)
     def walk_and_update(self):
         members = programmer._member_data_items
diff --git a/tests/out2_sup.py b/tests/out2_sup.py
index 7e6b3b78c3c99aa1404a111dbadc711f9abd2e7e..f653003e495dab78f04da3bb477aa2d0b256e258 100644
--- a/tests/out2_sup.py
+++ b/tests/out2_sup.py
@@ -1815,7 +1815,8 @@ class programmer(person):
             elarraytypes_ = child_.text
             elarraytypes_ = self.gds_validate_string(elarraytypes_, node, 'elarraytypes')
             self.elarraytypes = elarraytypes_
-            self.validate_ArrayTypes(self.elarraytypes)    # validate type ArrayTypes
+            # validate type ArrayTypes
+            self.validate_ArrayTypes(self.elarraytypes)
         super(programmer, self).buildChildren(child_, node, nodeName_, True)
     def walk_and_update(self):
         members = programmer._member_data_items
diff --git a/tests/people_procincl1_sup.py b/tests/people_procincl1_sup.py
index 522656a9889236fd76043d435c9a9b22737e301b..159527879b29ff922fe191990b4efc58c0776f1b 100644
--- a/tests/people_procincl1_sup.py
+++ b/tests/people_procincl1_sup.py
@@ -2873,7 +2873,8 @@ class programmer(person):
             elarraytypes_ = child_.text
             elarraytypes_ = self.gds_validate_string(elarraytypes_, node, 'elarraytypes')
             self.elarraytypes = elarraytypes_
-            self.validate_ArrayTypes(self.elarraytypes)    # validate type ArrayTypes
+            # validate type ArrayTypes
+            self.validate_ArrayTypes(self.elarraytypes)
         super(programmer, self).buildChildren(child_, node, nodeName_, True)
 # end class programmer
 
diff --git a/tests/people_procincl2_sup.py b/tests/people_procincl2_sup.py
index 522656a9889236fd76043d435c9a9b22737e301b..159527879b29ff922fe191990b4efc58c0776f1b 100644
--- a/tests/people_procincl2_sup.py
+++ b/tests/people_procincl2_sup.py
@@ -2873,7 +2873,8 @@ class programmer(person):
             elarraytypes_ = child_.text
             elarraytypes_ = self.gds_validate_string(elarraytypes_, node, 'elarraytypes')
             self.elarraytypes = elarraytypes_
-            self.validate_ArrayTypes(self.elarraytypes)    # validate type ArrayTypes
+            # validate type ArrayTypes
+            self.validate_ArrayTypes(self.elarraytypes)
         super(programmer, self).buildChildren(child_, node, nodeName_, True)
 # end class programmer
 
diff --git a/tests/prefix_classname1_sup.py b/tests/prefix_classname1_sup.py
index 55732b0bc54664b79132dd92970ef18bc1d404b0..24d96eb75dd21f3090e32c730c4abb336ca30386 100644
--- a/tests/prefix_classname1_sup.py
+++ b/tests/prefix_classname1_sup.py
@@ -1673,7 +1673,8 @@ class tomato_programmer(tomato_person):
             elarraytypes_ = child_.text
             elarraytypes_ = self.gds_validate_string(elarraytypes_, node, 'elarraytypes')
             self.elarraytypes = elarraytypes_
-            self.validate_ArrayTypes(self.elarraytypes)    # validate type ArrayTypes
+            # validate type ArrayTypes
+            self.validate_ArrayTypes(self.elarraytypes)
         super(tomato_programmer, self).buildChildren(child_, node, nodeName_, True)
 # end class tomato_programmer
 
diff --git a/tests/prefix_classname2_sup.py b/tests/prefix_classname2_sup.py
index 55732b0bc54664b79132dd92970ef18bc1d404b0..24d96eb75dd21f3090e32c730c4abb336ca30386 100644
--- a/tests/prefix_classname2_sup.py
+++ b/tests/prefix_classname2_sup.py
@@ -1673,7 +1673,8 @@ class tomato_programmer(tomato_person):
             elarraytypes_ = child_.text
             elarraytypes_ = self.gds_validate_string(elarraytypes_, node, 'elarraytypes')
             self.elarraytypes = elarraytypes_
-            self.validate_ArrayTypes(self.elarraytypes)    # validate type ArrayTypes
+            # validate type ArrayTypes
+            self.validate_ArrayTypes(self.elarraytypes)
         super(tomato_programmer, self).buildChildren(child_, node, nodeName_, True)
 # end class tomato_programmer
 
diff --git a/tests/to_etree1_sup.py b/tests/to_etree1_sup.py
index 0920d7a2d52ca06e732de7263a558c445e271f2c..e260ba1027586bf42471871bf28f522705b7bceb 100644
--- a/tests/to_etree1_sup.py
+++ b/tests/to_etree1_sup.py
@@ -1104,7 +1104,8 @@ class personType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires integer: %s' % exp)
             ival_ = self.gds_validate_integer(ival_, node, 'range')
             self.range_ = ival_
-            self.validate_RangeType(self.range_)    # validate type RangeType
+            # validate type RangeType
+            self.validate_RangeType(self.range_)
 # end class personType
 
 
@@ -1489,7 +1490,8 @@ class programmerType(personType):
             elarraytypes_ = child_.text
             elarraytypes_ = self.gds_validate_string(elarraytypes_, node, 'elarraytypes')
             self.elarraytypes = elarraytypes_
-            self.validate_ArrayTypes(self.elarraytypes)    # validate type ArrayTypes
+            # validate type ArrayTypes
+            self.validate_ArrayTypes(self.elarraytypes)
         super(programmerType, self).buildChildren(child_, node, nodeName_, True)
 # end class programmerType
 
@@ -1723,7 +1725,8 @@ class python_programmerType(programmerType):
                 raise_parse_error(child_, 'requires integer: %s' % exp)
             ival_ = self.gds_validate_integer(ival_, node, 'flowvalue')
             self.flowvalue = ival_
-            self.validate_FlowType(self.flowvalue)    # validate type FlowType
+            # validate type FlowType
+            self.validate_FlowType(self.flowvalue)
         elif nodeName_ == 'drcs':
             drcs_ = child_.text
             drcs_ = self.gds_validate_string(drcs_, node, 'drcs')
diff --git a/tests/to_etree2_sup.py b/tests/to_etree2_sup.py
index 0920d7a2d52ca06e732de7263a558c445e271f2c..e260ba1027586bf42471871bf28f522705b7bceb 100644
--- a/tests/to_etree2_sup.py
+++ b/tests/to_etree2_sup.py
@@ -1104,7 +1104,8 @@ class personType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires integer: %s' % exp)
             ival_ = self.gds_validate_integer(ival_, node, 'range')
             self.range_ = ival_
-            self.validate_RangeType(self.range_)    # validate type RangeType
+            # validate type RangeType
+            self.validate_RangeType(self.range_)
 # end class personType
 
 
@@ -1489,7 +1490,8 @@ class programmerType(personType):
             elarraytypes_ = child_.text
             elarraytypes_ = self.gds_validate_string(elarraytypes_, node, 'elarraytypes')
             self.elarraytypes = elarraytypes_
-            self.validate_ArrayTypes(self.elarraytypes)    # validate type ArrayTypes
+            # validate type ArrayTypes
+            self.validate_ArrayTypes(self.elarraytypes)
         super(programmerType, self).buildChildren(child_, node, nodeName_, True)
 # end class programmerType
 
@@ -1723,7 +1725,8 @@ class python_programmerType(programmerType):
                 raise_parse_error(child_, 'requires integer: %s' % exp)
             ival_ = self.gds_validate_integer(ival_, node, 'flowvalue')
             self.flowvalue = ival_
-            self.validate_FlowType(self.flowvalue)    # validate type FlowType
+            # validate type FlowType
+            self.validate_FlowType(self.flowvalue)
         elif nodeName_ == 'drcs':
             drcs_ = child_.text
             drcs_ = self.gds_validate_string(drcs_, node, 'drcs')
diff --git a/tests/validate_simpletypes1_sup.py b/tests/validate_simpletypes1_sup.py
index 46fdd205b15971459a57a6b2b90c39864378db35..5f197e9f4be628f272043ecc53b3beb2348929fd 100644
--- a/tests/validate_simpletypes1_sup.py
+++ b/tests/validate_simpletypes1_sup.py
@@ -1120,22 +1120,26 @@ class simpleOneType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires integer: %s' % exp)
             ival_ = self.gds_validate_integer(ival_, node, 'integer_range_1_value')
             self.integer_range_1_value = ival_
-            self.validate_integer_range_1_st(self.integer_range_1_value)    # validate type integer_range_1_st
+            # validate type integer_range_1_st
+            self.validate_integer_range_1_st(self.integer_range_1_value)
         elif nodeName_ == 'pattern_value':
             pattern_value_ = child_.text
             pattern_value_ = self.gds_validate_string(pattern_value_, node, 'pattern_value')
             self.pattern_value = pattern_value_
-            self.validate_pattern_st(self.pattern_value)    # validate type pattern_st
+            # validate type pattern_st
+            self.validate_pattern_st(self.pattern_value)
         elif nodeName_ == 'token_enum_value':
             token_enum_value_ = child_.text
             token_enum_value_ = self.gds_validate_string(token_enum_value_, node, 'token_enum_value')
             self.token_enum_value = token_enum_value_
-            self.validate_token_enum_st(self.token_enum_value)    # validate type token_enum_st
+            # validate type token_enum_st
+            self.validate_token_enum_st(self.token_enum_value)
         elif nodeName_ == 'token_enum_value':
             token_enum_value_ = child_.text
             token_enum_value_ = self.gds_validate_string(token_enum_value_, node, 'token_enum_value')
             self.token_enum_value = token_enum_value_
-            self.validate_token_enum_st(self.token_enum_value)    # validate type token_enum_st
+            # validate type token_enum_st
+            self.validate_token_enum_st(self.token_enum_value)
         elif nodeName_ == 'integer_range_incl_value':
             sval_ = child_.text
             try:
@@ -1144,7 +1148,8 @@ class simpleOneType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires integer: %s' % exp)
             ival_ = self.gds_validate_integer(ival_, node, 'integer_range_incl_value')
             self.integer_range_incl_value = ival_
-            self.validate_integer_range_incl_st(self.integer_range_incl_value)    # validate type integer_range_incl_st
+            # validate type integer_range_incl_st
+            self.validate_integer_range_incl_st(self.integer_range_incl_value)
         elif nodeName_ == 'integer_range_excl_value':
             sval_ = child_.text
             try:
@@ -1153,17 +1158,20 @@ class simpleOneType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires integer: %s' % exp)
             ival_ = self.gds_validate_integer(ival_, node, 'integer_range_excl_value')
             self.integer_range_excl_value = ival_
-            self.validate_integer_range_excl_st(self.integer_range_excl_value)    # validate type integer_range_excl_st
+            # validate type integer_range_excl_st
+            self.validate_integer_range_excl_st(self.integer_range_excl_value)
         elif nodeName_ == 'min_max_length_value':
             min_max_length_value_ = child_.text
             min_max_length_value_ = self.gds_validate_string(min_max_length_value_, node, 'min_max_length_value')
             self.min_max_length_value = min_max_length_value_
-            self.validate_min_max_length_st(self.min_max_length_value)    # validate type min_max_length_st
+            # validate type min_max_length_st
+            self.validate_min_max_length_st(self.min_max_length_value)
         elif nodeName_ == 'length_value':
             length_value_ = child_.text
             length_value_ = self.gds_validate_string(length_value_, node, 'length_value')
             self.length_value = length_value_
-            self.validate_length_st(self.length_value)    # validate type length_st
+            # validate type length_st
+            self.validate_length_st(self.length_value)
         elif nodeName_ == 'totalDigits_value':
             sval_ = child_.text
             try:
@@ -1172,7 +1180,8 @@ class simpleOneType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires float or double: %s' % exp)
             fval_ = self.gds_validate_float(fval_, node, 'totalDigits_value')
             self.totalDigits_value = fval_
-            self.validate_totalDigits_st(self.totalDigits_value)    # validate type totalDigits_st
+            # validate type totalDigits_st
+            self.validate_totalDigits_st(self.totalDigits_value)
         elif nodeName_ == 'anonymous_float_value':
             sval_ = child_.text
             try:
@@ -1181,7 +1190,8 @@ class simpleOneType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires float or double: %s' % exp)
             fval_ = self.gds_validate_float(fval_, node, 'anonymous_float_value')
             self.anonymous_float_value = fval_
-            self.validate_anonymous_float_valueType(self.anonymous_float_value)    # validate type anonymous_float_valueType
+            # validate type anonymous_float_valueType
+            self.validate_anonymous_float_valueType(self.anonymous_float_value)
         elif nodeName_ == 'primative_integer':
             sval_ = child_.text
             try:
@@ -1371,7 +1381,8 @@ class simpleTwoElementOneType(GeneratedsSuper):
             simpleTwoElementTwo_ = child_.text
             simpleTwoElementTwo_ = self.gds_validate_string(simpleTwoElementTwo_, node, 'simpleTwoElementTwo')
             self.simpleTwoElementTwo = simpleTwoElementTwo_
-            self.validate_simpleTwoElementTwoType(self.simpleTwoElementTwo)    # validate type simpleTwoElementTwoType
+            # validate type simpleTwoElementTwoType
+            self.validate_simpleTwoElementTwoType(self.simpleTwoElementTwo)
 # end class simpleTwoElementOneType
 
 
diff --git a/tests/validate_simpletypes1_warnings.txt b/tests/validate_simpletypes1_warnings.txt
index fda3802c249022b5c3ee64f8e3d6071b3d7a4c33..63271c761b9e56de37174ddb0bc0378b78f52137 100644
--- a/tests/validate_simpletypes1_warnings.txt
+++ b/tests/validate_simpletypes1_warnings.txt
@@ -30,5 +30,5 @@ tests/validate_simpletypes2_sup.py:926: UserWarning: Value "aaa12zzz" does not m
   warnings_.warn('Value "%(value)s" does not match xsd minLength restriction on pattern_st' % {"value" : value} )
 tests/validate_simpletypes2_sup.py:929: UserWarning: Value "aaa12zzz" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
   warnings_.warn('Value "%s" does not match xsd pattern restrictions: %s' % (value.encode('utf-8'), self.validate_pattern_st_patterns_, ))
-tests/validate_simpletypes2_sup.py:1312: UserWarning: Value "pqrst" does not match xsd minLength restriction on simpleTwoElementTwoType
+tests/validate_simpletypes2_sup.py:1322: UserWarning: Value "pqrst" does not match xsd minLength restriction on simpleTwoElementTwoType
   warnings_.warn('Value "%(value)s" does not match xsd minLength restriction on simpleTwoElementTwoType' % {"value" : value.encode("utf-8")} )
diff --git a/tests/validate_simpletypes2_sup.py b/tests/validate_simpletypes2_sup.py
index 46fdd205b15971459a57a6b2b90c39864378db35..5f197e9f4be628f272043ecc53b3beb2348929fd 100644
--- a/tests/validate_simpletypes2_sup.py
+++ b/tests/validate_simpletypes2_sup.py
@@ -1120,22 +1120,26 @@ class simpleOneType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires integer: %s' % exp)
             ival_ = self.gds_validate_integer(ival_, node, 'integer_range_1_value')
             self.integer_range_1_value = ival_
-            self.validate_integer_range_1_st(self.integer_range_1_value)    # validate type integer_range_1_st
+            # validate type integer_range_1_st
+            self.validate_integer_range_1_st(self.integer_range_1_value)
         elif nodeName_ == 'pattern_value':
             pattern_value_ = child_.text
             pattern_value_ = self.gds_validate_string(pattern_value_, node, 'pattern_value')
             self.pattern_value = pattern_value_
-            self.validate_pattern_st(self.pattern_value)    # validate type pattern_st
+            # validate type pattern_st
+            self.validate_pattern_st(self.pattern_value)
         elif nodeName_ == 'token_enum_value':
             token_enum_value_ = child_.text
             token_enum_value_ = self.gds_validate_string(token_enum_value_, node, 'token_enum_value')
             self.token_enum_value = token_enum_value_
-            self.validate_token_enum_st(self.token_enum_value)    # validate type token_enum_st
+            # validate type token_enum_st
+            self.validate_token_enum_st(self.token_enum_value)
         elif nodeName_ == 'token_enum_value':
             token_enum_value_ = child_.text
             token_enum_value_ = self.gds_validate_string(token_enum_value_, node, 'token_enum_value')
             self.token_enum_value = token_enum_value_
-            self.validate_token_enum_st(self.token_enum_value)    # validate type token_enum_st
+            # validate type token_enum_st
+            self.validate_token_enum_st(self.token_enum_value)
         elif nodeName_ == 'integer_range_incl_value':
             sval_ = child_.text
             try:
@@ -1144,7 +1148,8 @@ class simpleOneType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires integer: %s' % exp)
             ival_ = self.gds_validate_integer(ival_, node, 'integer_range_incl_value')
             self.integer_range_incl_value = ival_
-            self.validate_integer_range_incl_st(self.integer_range_incl_value)    # validate type integer_range_incl_st
+            # validate type integer_range_incl_st
+            self.validate_integer_range_incl_st(self.integer_range_incl_value)
         elif nodeName_ == 'integer_range_excl_value':
             sval_ = child_.text
             try:
@@ -1153,17 +1158,20 @@ class simpleOneType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires integer: %s' % exp)
             ival_ = self.gds_validate_integer(ival_, node, 'integer_range_excl_value')
             self.integer_range_excl_value = ival_
-            self.validate_integer_range_excl_st(self.integer_range_excl_value)    # validate type integer_range_excl_st
+            # validate type integer_range_excl_st
+            self.validate_integer_range_excl_st(self.integer_range_excl_value)
         elif nodeName_ == 'min_max_length_value':
             min_max_length_value_ = child_.text
             min_max_length_value_ = self.gds_validate_string(min_max_length_value_, node, 'min_max_length_value')
             self.min_max_length_value = min_max_length_value_
-            self.validate_min_max_length_st(self.min_max_length_value)    # validate type min_max_length_st
+            # validate type min_max_length_st
+            self.validate_min_max_length_st(self.min_max_length_value)
         elif nodeName_ == 'length_value':
             length_value_ = child_.text
             length_value_ = self.gds_validate_string(length_value_, node, 'length_value')
             self.length_value = length_value_
-            self.validate_length_st(self.length_value)    # validate type length_st
+            # validate type length_st
+            self.validate_length_st(self.length_value)
         elif nodeName_ == 'totalDigits_value':
             sval_ = child_.text
             try:
@@ -1172,7 +1180,8 @@ class simpleOneType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires float or double: %s' % exp)
             fval_ = self.gds_validate_float(fval_, node, 'totalDigits_value')
             self.totalDigits_value = fval_
-            self.validate_totalDigits_st(self.totalDigits_value)    # validate type totalDigits_st
+            # validate type totalDigits_st
+            self.validate_totalDigits_st(self.totalDigits_value)
         elif nodeName_ == 'anonymous_float_value':
             sval_ = child_.text
             try:
@@ -1181,7 +1190,8 @@ class simpleOneType(GeneratedsSuper):
                 raise_parse_error(child_, 'requires float or double: %s' % exp)
             fval_ = self.gds_validate_float(fval_, node, 'anonymous_float_value')
             self.anonymous_float_value = fval_
-            self.validate_anonymous_float_valueType(self.anonymous_float_value)    # validate type anonymous_float_valueType
+            # validate type anonymous_float_valueType
+            self.validate_anonymous_float_valueType(self.anonymous_float_value)
         elif nodeName_ == 'primative_integer':
             sval_ = child_.text
             try:
@@ -1371,7 +1381,8 @@ class simpleTwoElementOneType(GeneratedsSuper):
             simpleTwoElementTwo_ = child_.text
             simpleTwoElementTwo_ = self.gds_validate_string(simpleTwoElementTwo_, node, 'simpleTwoElementTwo')
             self.simpleTwoElementTwo = simpleTwoElementTwo_
-            self.validate_simpleTwoElementTwoType(self.simpleTwoElementTwo)    # validate type simpleTwoElementTwoType
+            # validate type simpleTwoElementTwoType
+            self.validate_simpleTwoElementTwoType(self.simpleTwoElementTwo)
 # end class simpleTwoElementOneType
 
 
diff --git a/tests/validate_simpletypes2_warnings.txt b/tests/validate_simpletypes2_warnings.txt
index fda3802c249022b5c3ee64f8e3d6071b3d7a4c33..63271c761b9e56de37174ddb0bc0378b78f52137 100644
--- a/tests/validate_simpletypes2_warnings.txt
+++ b/tests/validate_simpletypes2_warnings.txt
@@ -30,5 +30,5 @@ tests/validate_simpletypes2_sup.py:926: UserWarning: Value "aaa12zzz" does not m
   warnings_.warn('Value "%(value)s" does not match xsd minLength restriction on pattern_st' % {"value" : value} )
 tests/validate_simpletypes2_sup.py:929: UserWarning: Value "aaa12zzz" does not match xsd pattern restrictions: [['^aaa.*zzz$', '^bbb.*xxx$'], ['^.*123.*$', '^.*456.*$']]
   warnings_.warn('Value "%s" does not match xsd pattern restrictions: %s' % (value.encode('utf-8'), self.validate_pattern_st_patterns_, ))
-tests/validate_simpletypes2_sup.py:1312: UserWarning: Value "pqrst" does not match xsd minLength restriction on simpleTwoElementTwoType
+tests/validate_simpletypes2_sup.py:1322: UserWarning: Value "pqrst" does not match xsd minLength restriction on simpleTwoElementTwoType
   warnings_.warn('Value "%(value)s" does not match xsd minLength restriction on simpleTwoElementTwoType' % {"value" : value.encode("utf-8")} )