diff --git a/base/modules/psb_c_linmap_mod.f90 b/base/modules/psb_c_linmap_mod.f90
index 69e2cfd9..2a0ab5bb 100644
--- a/base/modules/psb_c_linmap_mod.f90
+++ b/base/modules/psb_c_linmap_mod.f90
@@ -195,7 +195,8 @@ contains
 
   end function psb_clinmap_sizeof
 
-  subroutine psb_c_linmap_sub(out_map,map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr)
+  subroutine psb_c_linmap_sub(out_map,map_kind,desc_X, desc_Y,&
+       & map_X2Y, map_Y2X,iaggr,naggr)
     use psb_linmap_type_mod
     implicit none 
     type(psb_clinmap_type), intent(out) :: out_map    
@@ -208,8 +209,8 @@ contains
 
   subroutine  psb_clinmap_transfer(mapin,mapout,info)
     use psb_realloc_mod
-    use psb_mat_mod, only : psb_move_alloc
     use psb_descriptor_type
+    use psb_mat_mod, only : psb_move_alloc
     implicit none 
     type(psb_clinmap_type) :: mapin,mapout
     integer, intent(out)      :: info 
diff --git a/base/modules/psb_d_linmap_mod.f90 b/base/modules/psb_d_linmap_mod.f90
index 169279a8..43637352 100644
--- a/base/modules/psb_d_linmap_mod.f90
+++ b/base/modules/psb_d_linmap_mod.f90
@@ -196,7 +196,8 @@ contains
 
   end function psb_dlinmap_sizeof
 
-  subroutine psb_d_linmap_sub(out_map,map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr)
+  subroutine psb_d_linmap_sub(out_map,map_kind,desc_X, desc_Y,&
+       & map_X2Y, map_Y2X,iaggr,naggr)
     use psb_linmap_type_mod
     implicit none 
     type(psb_dlinmap_type), intent(out) :: out_map    
diff --git a/base/modules/psb_linmap_mod.f90 b/base/modules/psb_linmap_mod.f90
index c9a2b097..125e00b3 100644
--- a/base/modules/psb_linmap_mod.f90
+++ b/base/modules/psb_linmap_mod.f90
@@ -38,7 +38,7 @@
 module psb_linmap_mod
 
   use psb_const_mod
-  use psb_descriptor_type
+!!$  use psb_descriptor_type
   use psb_linmap_type_mod
   use psb_s_linmap_mod
   use psb_d_linmap_mod
diff --git a/base/modules/psb_linmap_type_mod.f90 b/base/modules/psb_linmap_type_mod.f90
index 66d1fdf0..323948cc 100644
--- a/base/modules/psb_linmap_type_mod.f90
+++ b/base/modules/psb_linmap_type_mod.f90
@@ -55,16 +55,16 @@ module psb_linmap_type_mod
 
 
   type psb_slinmap_type 
-    integer, allocatable   :: itd_data(:), iaggr(:), naggr(:)
+    integer, allocatable  :: itd_data(:), iaggr(:), naggr(:)
     type(psb_desc_type), pointer :: p_desc_X=>null(), p_desc_Y=>null()
-    type(psb_desc_type)    :: desc_X, desc_Y
+    type(psb_desc_type)   :: desc_X, desc_Y
     type(psb_sspmat_type) :: map_X2Y, map_Y2X
   end type psb_slinmap_type
 
   type psb_dlinmap_type 
-    integer, allocatable   :: itd_data(:), iaggr(:), naggr(:)
+    integer, allocatable  :: itd_data(:), iaggr(:), naggr(:)
     type(psb_desc_type), pointer :: p_desc_X=>null(), p_desc_Y=>null()
-    type(psb_desc_type)    :: desc_X, desc_Y
+    type(psb_desc_type)   :: desc_X, desc_Y
     type(psb_dspmat_type) :: map_X2Y, map_Y2X
   end type psb_dlinmap_type
 
diff --git a/base/modules/psb_s_linmap_mod.f90 b/base/modules/psb_s_linmap_mod.f90
index e1d119b6..bbdd054d 100644
--- a/base/modules/psb_s_linmap_mod.f90
+++ b/base/modules/psb_s_linmap_mod.f90
@@ -198,7 +198,8 @@ contains
   end function psb_slinmap_sizeof
 
 
-  subroutine psb_s_linmap_sub(out_map,map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr)
+  subroutine psb_s_linmap_sub(out_map,map_kind,desc_X, desc_Y,&
+       & map_X2Y, map_Y2X,iaggr,naggr)
     use psb_linmap_type_mod
     implicit none 
     type(psb_slinmap_type), intent(out) :: out_map    
diff --git a/base/modules/psb_z_linmap_mod.f90 b/base/modules/psb_z_linmap_mod.f90
index 4cf1c5d2..05fdb6c9 100644
--- a/base/modules/psb_z_linmap_mod.f90
+++ b/base/modules/psb_z_linmap_mod.f90
@@ -176,8 +176,8 @@ contains
   end function psb_is_ok_zlinmap
 
   function psb_zlinmap_sizeof(map) result(val)
-    use psb_mat_mod, only : psb_sizeof
     use psb_descriptor_type
+    use psb_mat_mod, only : psb_sizeof
     implicit none 
     type(psb_zlinmap_type), intent(in) :: map
     integer(psb_long_int_k_) :: val
@@ -196,7 +196,8 @@ contains
 
   end function psb_zlinmap_sizeof
 
-  subroutine psb_z_linmap_sub(out_map,map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr)
+  subroutine psb_z_linmap_sub(out_map,map_kind,desc_X, desc_Y,&
+       & map_X2Y, map_Y2X,iaggr,naggr)
     use psb_linmap_type_mod
     implicit none 
     type(psb_zlinmap_type), intent(out) :: out_map    
@@ -209,8 +210,8 @@ contains
 
   subroutine  psb_zlinmap_transfer(mapin,mapout,info)
     use psb_realloc_mod
-    use psb_mat_mod, only : psb_move_alloc
     use psb_descriptor_type
+    use psb_mat_mod, only : psb_move_alloc
     implicit none 
     type(psb_zlinmap_type) :: mapin,mapout
     integer, intent(out)      :: info