Some cleanup of where things are placed.