diff --git a/openair1/PHY/NR_REFSIG/nr_gold.c b/openair1/PHY/NR_REFSIG/nr_gold.c
index 145fe11fab..8bee50eea7 100644
--- a/openair1/PHY/NR_REFSIG/nr_gold.c
+++ b/openair1/PHY/NR_REFSIG/nr_gold.c
@@ -75,20 +75,19 @@ void nr_init_pdcch_dmrs(PHY_VARS_gNB* gNB, uint32_t Nid)
 }
 
 
-void nr_init_pdsch_dmrs(PHY_VARS_gNB* gNB, uint8_t nscid, uint32_t Nid) {
-  uint32_t x1 = 0, x2 = 0;
-  uint8_t reset;
+void nr_init_pdsch_dmrs(PHY_VARS_gNB* gNB, uint8_t nscid, uint32_t Nid)
+{
   NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
   uint32_t ****pdsch_dmrs = gNB->nr_gold_pdsch_dmrs;
-  int pdsch_dmrs_init_length =  ((fp->N_RB_DL*12)>>5)+1;
-
-  for (uint8_t slot=0; slot<fp->slots_per_frame; slot++) {
-
-    for (uint8_t symb=0; symb<fp->symbols_per_slot; symb++) {
-      reset = 1;
-      x2 = ((1<<17) * (fp->symbols_per_slot*slot+symb+1) * ((Nid<<1)+1) +((Nid<<1)+nscid));
-      LOG_D(PHY,"PDSCH DMRS slot %d, symb %d x2 %x, Nid %d,nscid %d\n",slot,symb,x2,Nid,nscid);
-      for (uint32_t n=0; n<pdsch_dmrs_init_length; n++) {
+  int pdsch_dmrs_init_length = ((fp->N_RB_DL * 12) >> 5) + 1;
+  for (int slot = 0; slot < fp->slots_per_frame; slot++) {
+    for (int symb = 0; symb < fp->symbols_per_slot; symb++) {
+      uint8_t reset = 1;
+      uint32_t x1 = 0;
+      uint64_t temp_x2 = ((1UL << 17) * (fp->symbols_per_slot * slot + symb + 1) * ((Nid << 1) + 1) + ((Nid << 1) + nscid));
+      uint32_t x2 = temp_x2 % (1U << 31);
+      LOG_D(PHY,"PDSCH DMRS slot %d, symb %d, Nid %d, nscid %d, x2 %x\n",slot, symb, Nid, nscid, x2);
+      for (uint32_t n = 0; n < pdsch_dmrs_init_length; n++) {
         pdsch_dmrs[slot][symb][nscid][n] = lte_gold_generic(&x1, &x2, reset);
         reset = 0;
       }
diff --git a/openair1/PHY/NR_REFSIG/nr_gold_ue.c b/openair1/PHY/NR_REFSIG/nr_gold_ue.c
index 9048d162dc..b8ab04b5ee 100644
--- a/openair1/PHY/NR_REFSIG/nr_gold_ue.c
+++ b/openair1/PHY/NR_REFSIG/nr_gold_ue.c
@@ -74,21 +74,17 @@ void nr_gold_pdcch(PHY_VARS_NR_UE* ue,
 
 void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
                    int nscid,
-                   uint32_t nid) {
-  unsigned int x1 = 0, x2 = 0, x2tmp0 = 0;
-  uint8_t reset;
-  int pdsch_dmrs_init_length =  ((ue->frame_parms.N_RB_DL*12)>>5)+1;
-
+                   uint32_t nid)
+{
+  int pdsch_dmrs_init_length = ((ue->frame_parms.N_RB_DL * 12) >> 5) + 1;
   for (int ns=0; ns<ue->frame_parms.slots_per_frame; ns++) {
-
     for (int l=0; l<ue->frame_parms.symbols_per_slot; l++) {
-
-      reset = 1;
-      x2tmp0 = ((ue->frame_parms.symbols_per_slot*ns+l+1)*((nid<<1)+1))<<17;
-      x2 = (x2tmp0+(nid<<1)+nscid)%(1U<<31);  //cinit
-      LOG_D(PHY,"UE DMRS slot %d, symb %d, x2 %x, nscid %d\n",ns,l,x2,nscid);
-
-      for (int n=0; n<pdsch_dmrs_init_length; n++) {
+      uint8_t reset = 1;
+      uint64_t x2tmp0 = ((ue->frame_parms.symbols_per_slot * ns + l + 1) * ((nid << 1) + 1)) << 17;
+      uint32_t x1 = 0;
+      uint32_t x2 = (x2tmp0 + (nid << 1) + nscid) % (1U << 31);  //cinit
+      LOG_D(PHY,"UE DMRS slot %d, symb %d, nscid %d, x2 %x\n", ns, l, nscid, x2);
+      for (int n = 0; n < pdsch_dmrs_init_length; n++) {
         ue->nr_gold_pdsch[0][ns][l][nscid][n] = lte_gold_generic(&x1, &x2, reset);
         reset = 0;
       }