updating to pure templates
indentation fix