[us-commits] [ehb54/ultrascan3] 42e263: code cleanup before PR review