templates: use new style class and update comments