Tweaking translations
Cleanup