Fixed minor problems found by Sonar

- removed accidentally added WordEnumerator