chore: refactor code to eliminate redundancy #972
jamesgeorge007:feat/refactor% was force-pushed and no longer has any new commits.
Pushing new commits will allow the pull request to be re-opened.
Pushing new commits will allow the pull request to be re-opened.