* Address review comments