cleanup, re-org, document