Some minor codecleanup and removing of unnecessary code

I just removed some unnecessary calls or variable definitions, which could be a leftover from the latest commit. The code is a little bit shorter.

The other thing is just a little bit maintenance for the language files and a little bit code formatting.