fix remarks w.r.t. style and templating