second commit: grouping some lines