Good idea, I've updated the PR with your suggested optimization