Refactoring, completed russian translation