Refactoring
Bugfixed Translation