Update per comments from Afuna on the PR