Update translatable strings, code refactoring