cleaned up templates a little