Maintainability updates