Finish Refactor BelugaDemo