New syntax from pH7Tpl template engine
Code cleanup