Cleaning Up Some Templates