Code cleanup

I've gone through and cleaned some stuff up (because I'm anally retentive about this neat code thing :P )