Various formatting and consistency fixes