Update the templates to use sugar syntax for readability's sake

Updated code so ALL tests are passing and implemented in a topic branch (I think).

The sugar syntax makes life easier, because I only have one line to edit, thus reducing risk of breakage.