Various formatting fixes