reorganization + cleanup