NXCM-5194: Applied comments

From Alin to simplify the method.