more refactoring of ContributorList.