Analysis: Reverted unnecessary changes.

- Undone previous fixes which defeat the purpose.
- Fixes most regressing issues reported by code analysis.
- Code refactoring.
- Dictionary words added.