Yeah, good suggestion, it resonates well with the other code in the PR