refacting to try to allow easier override in corpora again