cleaned up a few things.