This is pretty much cleaning up some things.