Changes as per the PR comments