MNT: Refactor in progress
MNT: Refactor in progress

ericdill/xray-vision,licode/xray-vision,sameera2004/xray-vision,giltis/xray-vision,giltis/xray-vision,licode/xray-vision,ericdill/xray-vision,sameera2004/xray-vision