cleaned up a few templates