Some more reordering to follow the narrative and polishing