cleaned up some templates