More formatting and consistency fixes

Same here.