Address the review comments (part 1)