localization refactoring (I hope, the last)