diff --git a/src/parcsr_ls/gen_redcs_mat.c b/src/parcsr_ls/gen_redcs_mat.c
index f086a22f9e..e443e9ea1a 100644
--- a/src/parcsr_ls/gen_redcs_mat.c
+++ b/src/parcsr_ls/gen_redcs_mat.c
@@ -492,15 +492,22 @@ hypre_seqAMGCycle( hypre_ParAMGData *amg_data,
    return (Solve_err_flag);
 }
 
-/* generate sub communicator, which contains no idle processors */
+/*--------------------------------------------------------------------------
+ * hypre_GenerateSubComm
+ *
+ * generate sub communicator, which contains no idle processors
+ *--------------------------------------------------------------------------*/
 
-HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *new_comm_ptr)
+HYPRE_Int
+hypre_GenerateSubComm(MPI_Comm   comm,
+                      HYPRE_Int  participate,
+                      MPI_Comm  *new_comm_ptr)
 {
-   MPI_Comm new_comm;
-   hypre_MPI_Group orig_group, new_group;
-   hypre_MPI_Op hypre_MPI_MERGE;
-   HYPRE_Int *info, *ranks, new_num_procs, my_info, my_id, num_procs;
-   HYPRE_Int *list_len;
+   MPI_Comm          new_comm;
+   hypre_MPI_Group   orig_group, new_group;
+   hypre_MPI_Op      hypre_MPI_MERGE;
+   HYPRE_Int        *info, *ranks, new_num_procs, my_info, my_id, num_procs;
+   HYPRE_Int        *list_len;
 
    hypre_MPI_Comm_rank(comm, &my_id);
 
@@ -519,7 +526,8 @@ HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *
    {
       new_comm = hypre_MPI_COMM_NULL;
       *new_comm_ptr = new_comm;
-      return 0;
+
+      return hypre_error_flag;
    }
 
    ranks = hypre_CTAlloc(HYPRE_Int, new_num_procs + 2, HYPRE_MEMORY_HOST);
@@ -571,12 +579,18 @@ HYPRE_Int hypre_GenerateSubComm(MPI_Comm comm, HYPRE_Int participate, MPI_Comm *
 
    *new_comm_ptr = new_comm;
 
-   return 0;
+   return hypre_error_flag;
 }
 
+/*--------------------------------------------------------------------------
+ * hypre_merge_lists
+ *--------------------------------------------------------------------------*/
 
-void hypre_merge_lists (HYPRE_Int *list1, HYPRE_Int* list2, hypre_int *np1,
-                        hypre_MPI_Datatype *dptr)
+void
+hypre_merge_lists(HYPRE_Int          *list1,
+                  HYPRE_Int          *list2,
+                  hypre_int          *np1,
+                  hypre_MPI_Datatype *dptr)
 {
    HYPRE_Int i, len1, len2, indx1, indx2;
 
diff --git a/src/parcsr_ls/par_fsai_device.c b/src/parcsr_ls/par_fsai_device.c
index 7ddd240a85..84bebe2908 100644
--- a/src/parcsr_ls/par_fsai_device.c
+++ b/src/parcsr_ls/par_fsai_device.c
@@ -1,9 +1,9 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
- *******************************************************************************/
+ ******************************************************************************/
 
 #include "_hypre_parcsr_ls.h"
 #include "_hypre_utilities.hpp"
diff --git a/src/seq_mv/csr_spgemm_device_numblocks.c b/src/seq_mv/csr_spgemm_device_numblocks.c
index 31c199955e..183db2c910 100644
--- a/src/seq_mv/csr_spgemm_device_numblocks.c
+++ b/src/seq_mv/csr_spgemm_device_numblocks.c
@@ -1,9 +1,10 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
  ******************************************************************************/
+
 #include "seq_mv.h"
 
 #if defined(HYPRE_USING_GPU)
@@ -145,4 +146,3 @@ HYPRE_Int hypreDevice_CSRSpGemmBinnedGetBlockNumDim()
 }
 
 #endif /* defined(HYPRE_USING_GPU) */
-
diff --git a/src/seq_mv/csr_spgemm_device_numer.c b/src/seq_mv/csr_spgemm_device_numer.c
index 1e43a12c27..cc3e2acf80 100644
--- a/src/seq_mv/csr_spgemm_device_numer.c
+++ b/src/seq_mv/csr_spgemm_device_numer.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -234,4 +234,3 @@ hypreDevice_CSRSpGemmNumerWithRownnzUpperbound( HYPRE_Int       m,
 }
 
 #endif /* defined(HYPRE_USING_GPU) */
-
diff --git a/src/seq_mv/csr_spgemm_device_numer.h b/src/seq_mv/csr_spgemm_device_numer.h
index 21ee6ada5b..c4d51ac298 100644
--- a/src/seq_mv/csr_spgemm_device_numer.h
+++ b/src/seq_mv/csr_spgemm_device_numer.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/src/seq_mv/csr_spgemm_device_numer.in b/src/seq_mv/csr_spgemm_device_numer.in
index b342b5ec2b..92463d68ac 100644
--- a/src/seq_mv/csr_spgemm_device_numer.in
+++ b/src/seq_mv/csr_spgemm_device_numer.in
@@ -1,6 +1,6 @@
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -48,4 +48,3 @@ hypreDevice_CSRSpGemmNumerPostCopy<T_GROUP_SIZE[HYPRE_SPGEMM_BIN]>
 #endif
 
 #endif /* defined(HYPRE_USING_GPU) */
-
diff --git a/src/seq_mv/csr_spgemm_device_symbl.c b/src/seq_mv/csr_spgemm_device_symbl.c
index 92e067be15..e605c9e6ee 100644
--- a/src/seq_mv/csr_spgemm_device_symbl.c
+++ b/src/seq_mv/csr_spgemm_device_symbl.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -416,4 +416,3 @@ hypreDevice_CSRSpGemmRownnz( HYPRE_Int  m,
 }
 
 #endif /* defined(HYPRE_USING_GPU) */
-
diff --git a/src/seq_mv/csr_spgemm_device_symbl.h b/src/seq_mv/csr_spgemm_device_symbl.h
index e73398800d..bd9ecf326e 100644
--- a/src/seq_mv/csr_spgemm_device_symbl.h
+++ b/src/seq_mv/csr_spgemm_device_symbl.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/src/seq_mv/csr_spgemm_device_symbl.in b/src/seq_mv/csr_spgemm_device_symbl.in
index 8e7c79693a..dc51ffad26 100644
--- a/src/seq_mv/csr_spgemm_device_symbl.in
+++ b/src/seq_mv/csr_spgemm_device_symbl.in
@@ -1,6 +1,6 @@
 
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -38,4 +38,3 @@ hypre_spgemm_symbolic_max_num_blocks
 ( HYPRE_Int multiProcessorCount, HYPRE_Int *num_blocks_ptr, HYPRE_Int *block_size_ptr );
 
 #endif /* defined(HYPRE_USING_GPU) */
-
diff --git a/src/test/test_mgr.c b/src/test/test_mgr.c
index 2801357ccc..18d589315f 100644
--- a/src/test/test_mgr.c
+++ b/src/test/test_mgr.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+ * Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
  * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
  *
  * SPDX-License-Identifier: (Apache-2.0 OR MIT)