I'd say this is fine for now. We can refactor this refactor in another refactor if need-be