reduce cyclomatic complexity
code chore
update russian translation