more maintainability updates