diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index dc1d272dd0af0..fd2a8c63e5941 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -234,7 +234,7 @@ gfc_match_array_ref (gfc_array_ref *ar, gfc_array_spec *as, int init,
       team_just_seen = false;
       stat_just_seen = false;
 
-      if (gfc_match(" , team = %e",&tmp) == MATCH_YES && ar->stat == NULL)
+      if (gfc_match (" , team = %e", &tmp) == MATCH_YES && ar->stat == NULL)
 	{
 	  ar->team = tmp;
 	  team_just_seen = true;
@@ -246,7 +246,7 @@ gfc_match_array_ref (gfc_array_ref *ar, gfc_array_spec *as, int init,
 	  return MATCH_ERROR;
 	}
       
-      if (gfc_match(" , stat = %e",&tmp) == MATCH_YES && ar->stat == NULL)
+      if (gfc_match (" , stat = %e",&tmp) == MATCH_YES && ar->stat == NULL)
 	{
 	  ar->stat = tmp;
 	  stat_just_seen = true;
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 05b0b8286f09e..c43afaa05d320 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -4975,7 +4975,7 @@ gfc_ref_this_image (gfc_ref *ref)
 }
 
 gfc_expr *
-gfc_find_team_co(gfc_expr *e)
+gfc_find_team_co (gfc_expr *e)
 {
   gfc_ref *ref;
 
@@ -4993,7 +4993,7 @@ gfc_find_team_co(gfc_expr *e)
 }
 
 gfc_expr *
-gfc_find_stat_co(gfc_expr *e)
+gfc_find_stat_co (gfc_expr *e)
 {
   gfc_ref *ref;
 
diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c
index a2bb0d97a20e9..47970e6bbb729 100644
--- a/gcc/fortran/intrinsic.c
+++ b/gcc/fortran/intrinsic.c
@@ -1940,9 +1940,7 @@ add_functions (void)
 
   add_sym_1 ("get_team", GFC_ISYM_GET_TEAM, CLASS_TRANSFORMATIONAL,
 	     ACTUAL_NO, BT_INTEGER, di, GFC_STD_F2008_TS,
-	     gfc_check_get_team,
-	     NULL,
-	     gfc_resolve_get_team,
+	     gfc_check_get_team, NULL, gfc_resolve_get_team,
 	     "level", BT_INTEGER, di, OPTIONAL);
 
   add_sym_0 ("getuid", GFC_ISYM_GETUID, CLASS_IMPURE, ACTUAL_NO, BT_INTEGER,
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index fb20bcd1a3a78..fc2c561e2973b 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -3401,11 +3401,6 @@ gfc_match_change_team (void)
   
   new_st.op = EXEC_CHANGE_TEAM;
 
-  /* if (gfc_match ("%e", &teamid) != MATCH_YES) */
-  /*   goto syntax; */
-  /* m = gfc_match_char (','); */
-  /* if (m == MATCH_ERROR) */
-  /*   goto syntax; */
   if (gfc_match ("%e", &team) != MATCH_YES)
     goto syntax;
 
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index e0ff9e40abae6..d67119cfabd6b 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -3363,7 +3363,7 @@ gfc_build_intrinsic_function_decls (void)
 	    jtype = gfc_get_int_type (ikinds[jkind]);
 	    if (itype && jtype)
 	      {
-		sprintf(name, PREFIX("pow_i%d_i%d"), ikinds[ikind],
+		sprintf (name, PREFIX("pow_i%d_i%d"), ikinds[ikind],
 			ikinds[jkind]);
 		gfor_fndecl_math_powi[jkind][ikind].integer =
 		  gfc_build_library_function_decl (get_identifier (name),
@@ -3378,7 +3378,7 @@ gfc_build_intrinsic_function_decls (void)
 	    rtype = gfc_get_real_type (rkinds[rkind]);
 	    if (rtype && itype)
 	      {
-		sprintf(name, PREFIX("pow_r%d_i%d"), rkinds[rkind],
+		sprintf (name, PREFIX("pow_r%d_i%d"), rkinds[rkind],
 			ikinds[ikind]);
 		gfor_fndecl_math_powi[rkind][ikind].real =
 		  gfc_build_library_function_decl (get_identifier (name),
@@ -3390,7 +3390,7 @@ gfc_build_intrinsic_function_decls (void)
 	    ctype = gfc_get_complex_type (rkinds[rkind]);
 	    if (ctype && itype)
 	      {
-		sprintf(name, PREFIX("pow_c%d_i%d"), rkinds[rkind],
+		sprintf (name, PREFIX("pow_c%d_i%d"), rkinds[rkind],
 			ikinds[ikind]);
 		gfor_fndecl_math_powi[rkind][ikind].cmplx =
 		  gfc_build_library_function_decl (get_identifier (name),
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 0e3e3860fdbc3..b76003f5aa66f 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -853,7 +853,6 @@ gfc_conv_intrinsic_lib_function (gfc_se * se, gfc_expr * expr)
 
   if (m->id == GFC_ISYM_NONE)
     {
-      printf("Id %d none %d\n",id,GFC_ISYM_NONE);
       gfc_internal_error ("Intrinsic function %qs (%d) not recognized",
 			  expr->value.function.name, id);
     }
@@ -1852,7 +1851,7 @@ conv_caf_send (gfc_code *code) {
   gfc_se lhs_se, rhs_se;
   stmtblock_t block;
   tree caf_decl, token, offset, image_index, tmp, lhs_kind, rhs_kind;
-  tree may_require_tmp, src_stat, dst_stat, dst_team, src_team;
+  tree may_require_tmp, src_stat, dst_stat, dst_team;
   tree lhs_type = NULL_TREE;
   tree vec = null_pointer_node, rhs_vec = null_pointer_node;
   symbol_attribute lhs_caf_attr, rhs_caf_attr;
@@ -1868,7 +1867,7 @@ conv_caf_send (gfc_code *code) {
   lhs_caf_attr = gfc_caf_attr (lhs_expr);
   rhs_caf_attr = gfc_caf_attr (rhs_expr);
   src_stat = dst_stat = null_pointer_node;
-  src_team = dst_team = null_pointer_node;
+  dst_team = null_pointer_node;
 
   /* LHS.  */
   gfc_init_se (&lhs_se, NULL);
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index 3de9124f19a3d..c979c885da743 100644
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -735,16 +735,13 @@ gfc_trans_change_team (gfc_code *code)
     {
       gfc_se argse;
       tree team_type;
-      /* gfc_init_se (&argse, NULL); */
-      /* gfc_conv_expr_val (&argse, code->expr1); */
-      /* team_id = fold_convert (integer_type_node, argse.expr); */
+
       gfc_init_se (&argse, NULL);
       gfc_conv_expr_val (&argse, code->expr1);
       team_type = gfc_build_addr_expr (ppvoid_type_node, argse.expr);
 
       return build_call_expr_loc (input_location,
-				  gfor_fndecl_caf_change_team, 2,
-				  team_type,
+				  gfor_fndecl_caf_change_team, 2, team_type,
 				  build_int_cst (integer_type_node, 0));
     }
   else
@@ -785,9 +782,7 @@ gfc_trans_sync_team (gfc_code *code)
     {
       gfc_se argse;
       tree team_type;
-      /* gfc_init_se (&argse, NULL); */
-      /* gfc_conv_expr_val (&argse, code->expr1); */
-      /* team_id = fold_convert (integer_type_node, argse.expr); */
+
       gfc_init_se (&argse, NULL);
       gfc_conv_expr_val (&argse, code->expr1);
       team_type = gfc_build_addr_expr (ppvoid_type_node, argse.expr);