cleanup and moving things around