Templates cleaned up some more