[COPS-412]:- Update in code after code review