I'm not convinced this container is needed anymore, but I like the grouping of the labels for readability. Happy for it to stay.