Clean templates - private vars & Useless ?><?php & reindent & fixes