DATAGRAPH-330 : Used foreach and adjusted comment