address more code review comments
address more code review comments

Acidburn0zzz/adapter,webrtc/adapter,webrtc/adapter,jan-ivar/adapter,xdumaine/adapter,Acidburn0zzz/adapter,jan-ivar/adapter,xdumaine/adapter,Acidburn0zzz/adapter