Rearrange some things for cleanliness' sake