Made some whitespace changes to have smaller diff.