Reorganization and two minor style tweaks