shorten and clean up names