Right. I make sense to refactor such helper methods in order to make all of them static. We can try to do that in next commits.