Formatting and aesthetic fixes
After fixing the main MT issues here 24392
Aesthetics and indent changes
Including removing spurious ^M
from source files.
Although this looks big in reality it is mainly formatting which I postponed in the previous MR.