Improve the class info section further.