feb10: More formatting fixes