Apply Christina's code review comments.