MOSYNC-3063: - added some comments and a small refactorization after cipri code reviewed the task