TMDM-7456: i18n and code refactoring/refine