Improve labeling slightly