@divad12 also pointed that out. We decided that it's a good way to structure the code and easy to read, so it stayed. If you really want I can switch it out though.