more template simplification