Better class drawing