Change giving UIDs to suppress serial warnings.
Minor code layout improvements while read the code.