moving things around, cleaning up