diff --git a/src/LIB/SURCOUCHE/src/modd_argslist_ll.f90 b/src/LIB/SURCOUCHE/src/modd_argslist_ll.f90
index 0d5bf289d1b419cef4bce48fa948e139a2fad748..783836d601b7d8c768ef21f6374e22fb4e01e6a7 100644
--- a/src/LIB/SURCOUCHE/src/modd_argslist_ll.f90
+++ b/src/LIB/SURCOUCHE/src/modd_argslist_ll.f90
@@ -1,16 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1998-2019 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 
 !      #######################
        MODULE MODD_ARGSLIST_ll
@@ -45,11 +37,13 @@
 !
 !-------------------------------------------------------------------------------
 !
-  USE MODD_STRUCTURE2_ll, ONLY : HALO2_ll
+USE MODD_STRUCTURE2_ll, ONLY: HALO2_ll
+
+implicit none
 !
-!     ############
-      TYPE LIST_ll
-!     ############
+!###########
+TYPE LIST_ll
+!###########
 !
 !!****  *Type LIST_ll* -
 !
@@ -61,22 +55,24 @@
 !
 !-------------------------------------------------------------------------------
 !
-  INTEGER :: NCARD
-  LOGICAL :: L1D, L2D, L3D
+  INTEGER :: NCARD = 0
+  LOGICAL :: L1D = .FALSE.
+  LOGICAL :: L2D = .FALSE.
+  LOGICAL :: L3D = .FALSE.
 !
-  REAL, DIMENSION(:,:,:), POINTER :: ARRAY3D
-  REAL, DIMENSION(:,:), POINTER :: ARRAY2D
-  REAL, DIMENSION(:), POINTER :: ARRAY1D
+  REAL, DIMENSION(:),     POINTER :: ARRAY1D => NULL()
+  REAL, DIMENSION(:,:),   POINTER :: ARRAY2D => NULL()
+  REAL, DIMENSION(:,:,:), POINTER :: ARRAY3D => NULL()
 !
-  TYPE(LIST_ll), POINTER :: NEXT
+  TYPE(LIST_ll),          POINTER :: NEXT => NULL()
 !
-      END TYPE LIST_ll
+END TYPE LIST_ll
 !
 !-------------------------------------------------------------------------------
 !
-!     ##############
-      TYPE LIST1D_ll
-!     ##############
+!#############
+TYPE LIST1D_ll
+!#############
 !
 !!****  *Type LIST1D_ll* -
 !
@@ -87,20 +83,20 @@
 !
 !-------------------------------------------------------------------------------
 !
-  INTEGER :: NCARD
+  INTEGER :: NCARD = 0
 !
-  REAL, DIMENSION(:), POINTER :: ARRAY1D
-  CHARACTER(LEN=1) :: CDIR
+  REAL, DIMENSION(:), POINTER :: ARRAY1D => NULL()
+  CHARACTER(LEN=1)            :: CDIR
 !
-  TYPE(LIST1D_ll), POINTER :: NEXT
+  TYPE(LIST1D_ll),    POINTER :: NEXT => NULL()
 !
-      END TYPE LIST1D_ll
+END TYPE LIST1D_ll
 !
 !-------------------------------------------------------------------------------
 !
-!     #################
-      TYPE HALO2LIST_ll
-!     #################
+!################
+TYPE HALO2LIST_ll
+!################
 !
 !!****  *Type HALO2LIST_ll* -
 !
@@ -111,13 +107,13 @@
 !
 !-------------------------------------------------------------------------------
 !
-  INTEGER :: NCARD
+  INTEGER :: NCARD = 0
 !
-  TYPE(HALO2_ll), POINTER :: HALO2
+  TYPE(HALO2_ll),     POINTER :: HALO2 => NULL()
 !
-  TYPE(HALO2LIST_ll), POINTER :: NEXT
+  TYPE(HALO2LIST_ll), POINTER :: NEXT => NULL()
 !
-      END TYPE HALO2LIST_ll
+END TYPE HALO2LIST_ll
 !
 !-------------------------------------------------------------------------------
 !
diff --git a/src/LIB/SURCOUCHE/src/modd_structure2_ll.f90 b/src/LIB/SURCOUCHE/src/modd_structure2_ll.f90
index 5a823e55df4954f4a670256b39e8be6d48cfb296..3b04ba768724c80140e10aa1af7a7d4071651e1d 100644
--- a/src/LIB/SURCOUCHE/src/modd_structure2_ll.f90
+++ b/src/LIB/SURCOUCHE/src/modd_structure2_ll.f90
@@ -1,20 +1,11 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1998-2019 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
-
-!      ########################
-       MODULE MODD_STRUCTURE2_ll
-!      ########################
+!########################
+MODULE MODD_STRUCTURE2_ll
+!########################
 !
 !!****  *MODD_PARALLEL2* Contains the variables to treat
 !                        the second layer of the halo
@@ -46,18 +37,20 @@
 !
 !-------------------------------------------------------------------------------
 !
-!     #############
-      TYPE HALO2_ll
-!     #############
+implicit none
+!
+!############
+TYPE HALO2_ll
+!############
 !
 ! Type for the second layer of the halo
 !
-  REAL, DIMENSION(:,:), POINTER :: WEST
-  REAL, DIMENSION(:,:), POINTER :: EAST
-  REAL, DIMENSION(:,:), POINTER :: NORTH
-  REAL, DIMENSION(:,:), POINTER :: SOUTH
+  REAL, DIMENSION(:,:), POINTER :: WEST  => NULL()
+  REAL, DIMENSION(:,:), POINTER :: EAST  => NULL()
+  REAL, DIMENSION(:,:), POINTER :: NORTH => NULL()
+  REAL, DIMENSION(:,:), POINTER :: SOUTH => NULL()
 !
-      END TYPE HALO2_ll
+END TYPE HALO2_ll
 !
 !-------------------------------------------------------------------------------
 !