Further re-factoring of interactive VR demo