Merged some white-space ficing commits with the commits they fixed and rebased