Style changes and minor fixes OPENTOK-12124