[US128.3] Code simplification