The clean up includes removing white space changes, adding logs,
adding comments to make various changes more obvious, etc.