Formatting fixes and simplifications.