Refactored webrtc