de: further improvements to maintainability