DSSSM-272 #time 50m Cleaning template.php for code review