Cleaning up a bit and restructing things.