Made changes as per code-review feedback

#1303