All indentation changed to TWO spaces.
I do realize this PR is very hard to follow because of this, sorry.
Should have done it in two steps.
However, 99% of the changes are indentation