Small refactoring and russian translation