Yes, that is a fine solution.
@aurimasv Is it okay if I just delete the unnecessary comments and then make the squash? Afterwards, you could make the "publisher matching" stuff and moving the code around.