**Describe the refactoring action** Clean up and modernize code. **Expected benefit** Better readable and maintainable code.