template coding standard fixes
Merge pull request #5290 from splashingpixels/templates

template coding standard fixes