Alternative templating, cleanup.

Just added brackets.