More rearrangements and code.