> But this can be done in next PR or commit

I would do it in this one.

> is it supposed to be used out of two classes that we have now ?

Yes, this should be a function instead of a method.