minor template cleanup rel to #516