End of string problem fixed
Now unused constant removed
Move methods, add a small headline comment
Correction of test expectations