Addressing += review comments