Refactoring for localization #62

Closed alitsiya closed 6 years ago