Cleaned up lots of things.