yet more maintainability updates