Adding some more translations
Code cleanUp