common: no logic change, update comments