template coding standard fixes