Refactoring
Adding translations