Refactoring yandex export