String translations managment, code refactoring