Reorganization and some clean-up