diff --git a/Modules/Core/Metadata/include/otbNoDataHelper.h b/Modules/Core/Metadata/include/otbNoDataHelper.h
index 9203a6b4e517d06f6d7a251adc639a77aae0b1ed..11b68cad6c6da50e3a9c15805c30fb206fb5a7ff 100644
--- a/Modules/Core/Metadata/include/otbNoDataHelper.h
+++ b/Modules/Core/Metadata/include/otbNoDataHelper.h
@@ -61,18 +61,7 @@ template<typename T> bool IsNoData(const T & pixel, const
   assert(flags.size()>0);
   assert(values.size()>0);
 
-  if(nanIsNoData && vnl_math_isnan(values[0]))
-    return true;
-
-
-  if(flags[0])
-    {
-    return (pixel == values[0]);
-    }
-  else
-    {
-    return false;
-    }
+  return ((nanIsNoData && vnl_math_isnan(pixel)) || (flags[0] && (pixel == values[0])))
 }
 
 /**