rename local field from grouping to group and a minor format cleanup