Address Christina's review comments