Some cleanup reorganizing things.