moving things around for housekeeping