address review comments
address review comments

harme199497/adapter,calebboyd/adapter,calebboyd/adapter,jan-ivar/adapter,Zauberstuhl/adapter,shines/adapter,4lejandrito/adapter,4lejandrito/adapter,xdumaine/adapter,Zauberstuhl/adapter,4lejandrito/adapter,calebboyd/adapter,Acidburn0zzz/adapter,webrtc/adapter,shines/adapter,jan-ivar/adapter,xdumaine/adapter,Zauberstuhl/adapter,Acidburn0zzz/adapter,webrtc/adapter,harme199497/adapter,shines/adapter,Acidburn0zzz/adapter,harme199497/adapter