Template spelling and coding style touch-ups