Russified and little code refactor