Minor: better var. grouping