Ok, I will refactor it as it was. I prefer the current variant as I find it easier to understand what the code does.