minor cleanup of template-based configuration