Changed more formatting to gtc preferred code style
Changed more hybrid template formatting to gtc preferred code style