Making changes as per code review