Changes as per PR review comments