MOSYNC-2858 Modifications from code review