I always have to look up these :)

My editor fixed some whitespace issues as well, the meat of this is at the end of the diff.