Refactored code to be compliant with ruff.
Error B006 will be ignored, due to implied breaking changes if fixed.
B006