sry, not my code and I feel not confident enough to change the code without breaking something. But we will have a ticket for the refactoring in today's planning