Address review comments from Charles