refactor iarc code