much whitespace change, should be split from the functional changes.