Apply Christina's review comments