0004212: Valid USTID-Numbers are considered incorrect; Code beautifying