diff --git a/src/grid.c b/src/grid.c
index 209cffb6aaedf04d7caa4abd8da0b26bcefca3ce..6d23c1ac045fb1af2315fce3a440d55c589792fd 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -2593,7 +2593,7 @@ gridCompareP(void *gridptr1, void *gridptr2)
 }
 
 static void
-gridComplete(grid_t *grid)
+grid_complete(grid_t *grid)
 {
   const int gridID = grid->self;
 
@@ -2781,7 +2781,7 @@ gridGenerate(const grid_t *grid)
   gridptr->gme.ni2 = grid->gme.ni2;
   gridptr->gme.ni3 = grid->gme.ni3;
 
-  gridComplete(gridptr);
+  grid_complete(gridptr);
 
   cdiCopyVarKey(&grid->keys, CDI_KEY_UUID, &gridptr->keys);
 
@@ -4613,8 +4613,8 @@ cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode)
           1 search in grid table only
           2 search in grid table only and don't store the grid in vlist
    */
-  bool gridglobdefined = false;
-  bool griddefined = false;
+  bool gridIsDefinedGlobal = false;
+  bool gridIsDefined = false;
   int gridID = CDI_UNDEFID;
   vlist_t *vlistptr = vlist_to_pointer(vlistID);
 
@@ -4627,7 +4627,7 @@ cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode)
           {
             if (gridCompare(gridID, grid, false) == false)
               {
-                griddefined = true;
+                gridIsDefined = true;
                 break;
               }
           }
@@ -4635,28 +4635,28 @@ cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode)
           Error("Internal problem: undefined gridID in vlist %d, position %u!", vlistID, index);
       }
 
-  if (!griddefined)
+  if (!gridIsDefined)
     {
       struct gridCompareSearchState query;
       query.queryKey = grid;  // = { .queryKey = grid };
-      if ((gridglobdefined = (cdiResHFilterApply(&gridOps, gridCompareSearch, &query) == CDI_APPLY_STOP)))
+      if ((gridIsDefinedGlobal = (cdiResHFilterApply(&gridOps, gridCompareSearch, &query) == CDI_APPLY_STOP)))
         gridID = query.resIDValue;
 
-      if (mode == 1 && gridglobdefined)
+      if (mode == 1 && gridIsDefinedGlobal)
         for (int index = 0; index < ngrids; index++)
           if (vlistptr->gridIDs[index] == gridID)
             {
-              gridglobdefined = false;
+              gridIsDefinedGlobal = false;
               break;
             }
     }
 
-  if (!griddefined)
+  if (!gridIsDefined)
     {
-      if (!gridglobdefined)
+      if (!gridIsDefinedGlobal)
         {
           grid->self = gridID = reshPut(grid, &gridOps);
-          gridComplete(grid);
+          grid_complete(grid);
         }
       if (mode < 2)
         {
@@ -4666,7 +4666,7 @@ cdiVlistAddGridIfNew(int vlistID, grid_t *grid, int mode)
         }
     }
 
-  return (struct addIfNewRes){ .Id = gridID, .isNew = (!griddefined && !gridglobdefined) };
+  return (struct addIfNewRes){ .Id = gridID, .isNew = (!gridIsDefined && !gridIsDefinedGlobal) };
 }
 
 const struct gridVirtTable cdiGridVtable = {
diff --git a/src/stream_cdf_i.c b/src/stream_cdf_i.c
index 9fefc3062c764969132f88fb0c4056aa53d733a0..b002e60e4cb413023986cea2f6e8f618789ec320 100644
--- a/src/stream_cdf_i.c
+++ b/src/stream_cdf_i.c
@@ -2228,7 +2228,7 @@ cdf_check_gridtype(int *gridtype, bool isLon, bool isLat, size_t xsize, size_t y
 {
   if (isLat && (isLon || xsize == 0))
     {
-      double yinc = 0;
+      double yinc = 0.0;
       if (isLon && ysize > 1)
         {
           yinc = fabs(grid->y.vals[0] - grid->y.vals[1]);
@@ -2245,14 +2245,14 @@ cdf_check_gridtype(int *gridtype, bool isLon, bool isLat, size_t xsize, size_t y
           grid->np = (int) (ysize / 2);
         }
       else
-        *gridtype = GRID_LONLAT;
+        {
+          *gridtype = GRID_LONLAT;
+        }
     }
-  else if (isLon && !isLat && ysize == 0)
+  else
     {
-      *gridtype = GRID_LONLAT;
+      *gridtype = (isLon && !isLat && ysize == 0) ? GRID_LONLAT : GRID_GENERIC;
     }
-  else
-    *gridtype = GRID_GENERIC;
 }
 
 static bool
@@ -2879,17 +2879,17 @@ cdf_define_all_grids(stream_t *streamptr, ncgrid_t *ncgrid, int vlistID, ncdim_t
       ncvar_t *ncvar = &ncvars[ncvarid];
       if (ncvar->varStatus == DataVar && ncvar->gridID == CDI_UNDEFID)
         {
-          int ndims = ncvar->ndims;
+          const int ndims = ncvar->ndims;
           int *dimtype = ncvar->dimtype;
           int vdimid = CDI_UNDEFID;
           struct addIfNewRes projAdded = { .Id = CDI_UNDEFID, .isNew = 0 }, gridAdded = { .Id = CDI_UNDEFID, .isNew = 0 };
           int xdimid = CDI_UNDEFID, ydimid = CDI_UNDEFID;
-          int nydims = cdf_get_xydimid(ndims, ncvar->dimids, dimtype, &xdimid, &ydimid);
+          const int nydims = cdf_get_xydimid(ndims, ncvar->dimids, dimtype, &xdimid, &ydimid);
 
           int xaxisid = (xdimid != CDI_UNDEFID) ? ncdims[xdimid].ncvarid : CDI_UNDEFID;
           int yaxisid = (ydimid != CDI_UNDEFID) ? ncdims[ydimid].ncvarid : CDI_UNDEFID;
-          int xvarid = (ncvar->xvarid != CDI_UNDEFID) ? ncvar->xvarid : xaxisid;
-          int yvarid = (ncvar->yvarid != CDI_UNDEFID) ? ncvar->yvarid : yaxisid;
+          const int xvarid = (ncvar->xvarid != CDI_UNDEFID) ? ncvar->xvarid : xaxisid;
+          const int yvarid = (ncvar->yvarid != CDI_UNDEFID) ? ncvar->yvarid : yaxisid;
 
           size_t xsize = (xdimid != CDI_UNDEFID) ? ncdims[xdimid].len : 0;
           size_t ysize = (ydimid != CDI_UNDEFID) ? ncdims[ydimid].len : 0;