--- a/Tools__CodeHighlightingService.st	Tue Dec 13 15:13:09 2016 +0100
+++ b/Tools__CodeHighlightingService.st	Tue Dec 13 18:22:04 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
               All Rights Reserved
@@ -64,7 +66,6 @@
 "
 ! !
 
-
 !CodeHighlightingService class methodsFor:'accessing'!
 
 label
@@ -244,7 +245,7 @@
                 "textView" modified ifFalse:[
                     Screen currentScreenQuerySignal answer:codeView device
                     do:[
-                        "/ cg: not a ood idea to handle it here;
+                        "/ cg: not a good idea to handle it here;
                         "/ Syntaxhighlighter does it also, and will generate a better colorized string
 "/                        Parser parseErrorSignal handle:[:ex |
 "/                            |errMsg|
@@ -264,15 +265,11 @@
                             codeAspect := codeView codeAspect.
                             codeAspect == SyntaxHighlighter codeAspectMethod ifTrue:[
                                 highlighterClasses do:[:e|newCode := e formatMethod:mthd source:newCode in:cls using:syntaxPreferences elementsInto: elements].
-                            ] ifFalse:[
-                                codeAspect == (SyntaxHighlighter codeAspectExpression) ifTrue:[
-                                    highlighterClasses do:[:e|newCode := e formatExpression:newCode in:cls elementsInto: elements].
-                                ] ifFalse:[
-                                    codeAspect == (SyntaxHighlighter codeAspectClassDefinition) ifTrue:[
-                                        highlighterClasses do:[:e|newCode := e formatClassDefinition:newCode string in:cls elementsInto: elements].
-                                    ]
-                                ].
-                            ].
+                            ] ifFalse:[codeAspect == SyntaxHighlighter codeAspectExpression ifTrue:[
+                                highlighterClasses do:[:e|newCode := e formatExpression:newCode in:cls elementsInto: elements].
+                            ] ifFalse:[codeAspect == SyntaxHighlighter codeAspectClassDefinition ifTrue:[
+                                highlighterClasses do:[:e|newCode := e formatClassDefinition:newCode string in:cls elementsInto: elements].
+                            ]]].
 "/                        ]
                     ].
                     newCode notNil ifTrue:[