wordsmithing and cleanup