Could you please open a PR with your refactor? This way everyone can benefit