coding standards fixes
Merge pull request #4563 from splashingpixels/master

coding standards fixes