Made changes as per code review feedback

#1884
Made changes as per code review feedback

#1884