Made changes as per code-review feedback