Address Daniel's review comments.