Cleaned up on a few things.