Whitespace Matching the right way

Good to merge