More formatting and consistency fixes

...that one too