Address Reynold's review comments