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