cleaning things up moving things around