I (rgrimes) cleaned the code up some, mostly just format stuff.