Cleaned up lots of stuff.