Rearranging stuff and cleaning up house