Refactoring the class and move the translation to a Translator singleton