ARGUS-154: update per review comments