Update to spacing.
Minor template edits.