Probably true, I'd like to tackle that refactoring in a separate PR since it obscure the changes in this feature.