Sloppy comments fixed & code shaved for my party.