Small template clean up