Address more review comments: