Fix golint in templates

Finishes fixing issue #13.