minor styling enhancement, DRY out code for grouping