Reword/fixup messy style