de: Further improvements to the maintainability