Fix alignment
Fix aligns
Use insGroupedByRelation
Better naming
Use ranges