Formatting fixes.
Minor formatting
Merge remote-tracking branch 'origin/master' into RegimeSwitch