Finish initial separation into headers