Yes, I refactored the method! Let me update the pull request