shorten name
improve ordering