More formatting and consistency fixes