reorganization and housekeeping