Address Christina's code review comments.