whitespace changes should really be split out of the functional changes