small cleanup, renamed sz to U2 etc