major cleanup, reworking, and restructuring