B-55623 Changes from review feedback