vk refactor