diff --git a/src/shacl-shape-lib/connectors-shacl-shape.xsl b/src/shacl-shape-lib/connectors-shacl-shape.xsl
index 2b03a07..c7b6bb5 100644
--- a/src/shacl-shape-lib/connectors-shacl-shape.xsl
+++ b/src/shacl-shape-lib/connectors-shacl-shape.xsl
@@ -488,9 +488,9 @@
             <rdf:Description
                 rdf:about="{f:buildPropertyShapeURI($sourceClassName,$targetRole)}">
                 <sh:sparql rdf:parseType="Resource">
-                    <sh:select> SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
+                    <sh:select>SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
                         select="$targetRoleURI"/>&gt; ?that . ?that &lt;<xsl:value-of
-                            select="$targetRoleURI"/>&gt; ?this .} </sh:select>
+                            select="$targetRoleURI"/>&gt; ?this .}</sh:select>
                 </sh:sparql>
             </rdf:Description>
 
@@ -501,9 +501,9 @@
             <rdf:Description
                 rdf:about="{f:buildPropertyShapeURI($sourceClassName,$targetRole)}">
                 <sh:sparql rdf:parseType="Resource">
-                    <sh:select> SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
+                    <sh:select>SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
                         select="$targetRoleURI"/>&gt; ?that . ?that &lt;<xsl:value-of
-                            select="$targetRoleURI"/>&gt; ?this .} </sh:select>
+                            select="$targetRoleURI"/>&gt; ?this .}</sh:select>
                 </sh:sparql>
             </rdf:Description>
 
@@ -511,9 +511,9 @@
             <rdf:Description
                 rdf:about="{f:buildPropertyShapeURI($targetClassName,$sourceRole)}">
                 <sh:sparql rdf:parseType="Resource">
-                    <sh:select> SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
+                    <sh:select>SELECT ?this ?that WHERE { ?this &lt;<xsl:value-of
                         select="$sourceRoleURI"/>&gt; ?that . ?that &lt;<xsl:value-of
-                            select="$sourceRoleURI"/>&gt; ?this .} </sh:select>
+                            select="$sourceRoleURI"/>&gt; ?this .}</sh:select>
                 </sh:sparql>
             </rdf:Description>
 
diff --git a/src/shacl-shape-lib/descriptors-shacl-shape.xsl b/src/shacl-shape-lib/descriptors-shacl-shape.xsl
index 04f6143..e1cc996 100644
--- a/src/shacl-shape-lib/descriptors-shacl-shape.xsl
+++ b/src/shacl-shape-lib/descriptors-shacl-shape.xsl
@@ -83,10 +83,10 @@
         <rdf:Description rdf:about="{$uri}">
             <xsl:choose>
                 <xsl:when test="$rdfsComment=fn:true()">
-                    <rdfs:comment><xsl:value-of select="$comment"/></rdfs:comment>
+                    <rdfs:comment><xsl:value-of select="fn:normalize-space($comment)"/></rdfs:comment>
                 </xsl:when>
                 <xsl:otherwise>
-                    <sh:description><xsl:value-of select="$comment"/></sh:description>
+                    <sh:description><xsl:value-of select="fn:normalize-space($comment)"/></sh:description>
                 </xsl:otherwise>
             </xsl:choose>
         </rdf:Description>
diff --git a/src/shacl-shape-lib/elements-shacl-shape.xsl b/src/shacl-shape-lib/elements-shacl-shape.xsl
index d72127c..171349f 100644
--- a/src/shacl-shape-lib/elements-shacl-shape.xsl
+++ b/src/shacl-shape-lib/elements-shacl-shape.xsl
@@ -229,8 +229,7 @@
     <xsl:template name="abstractClassDeclaration">
         <xsl:param name="classURI"/>
         <sh:sparql rdf:parseType="Resource">
-            <sh:select>SELECT ?this WHERE { ?this a &lt;<xsl:value-of select="$classURI"/>&gt; . }
-            </sh:select>
+            <sh:select>SELECT ?this WHERE { ?this a &lt;<xsl:value-of select="$classURI"/>&gt; . }</sh:select>
         </sh:sparql>
     </xsl:template>