moving things around and cleaning up a bit