minor template readability changes