[MAGEMEP-117] Improving comments