maintainability improvements