Code refactor and optimize r2_gi feature

Закрыто xottab-duty запросил слияние github/fork/GermanAizek/fix-gi в dev

Created by: GermanAizek

@xottab-duty, Improving code readability and performance