Move things around, cleanups