Cleaned up a bunch of stuff.
Simplified some stuff.