Cleaned up some things.