Changes as per code review ...