Organization and cleanup before major revisions to the language