More clean up and rearrangements