Refactoring for localization #62

Closed alitsiya closed 7 years ago