Thanks for the feedback. I'll make the tweaks and update the PR later today to remove the code duplication.