Cleaning up templating examples