Moved some things around, and cleaned up.