More cosmetic changes and small fixes
Merge pull request #3 from bsrao/OPENTOK-12124

More cosmetic changes and small fixes