More formatting and consistency fixes

here as well