More template/report clean-up