template formating cleanups