Clean up the template tags for #11
Merge pull request #16 from peterwilsoncc/BQ/template-tidy

Clean up the template tags for #11