minor template cleanups