More formatting and consistency fixes

...and here