Refacor Yandex loader and a whole site