More formatting and consistency fixes

nope