Adding class numbers, removing term code