diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index cc75044700..ae7d32bb3b 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -2089,7 +2089,7 @@ static void pim_show_state(struct pim_instance *pim, struct vty *vty,
 		} else {
 			vty_out(vty, "%-6d %-15s  %-15s  %-3s  %-16s  ",
 					c_oil->installed, src_str, grp_str,
-					isRpt? "y" : "n", in_ifname);
+					isRpt ? "y" : "n", in_ifname);
 		}
 
 		for (oif_vif_index = 0; oif_vif_index < MAXVIFS;
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index dc45832f26..8b54bcf019 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -1811,14 +1811,16 @@ void pim_upstream_find_new_rpf(struct pim_instance *pim)
 				zlog_debug(
 					"%s: Upstream %s without a path to send join, checking",
 					__PRETTY_FUNCTION__, up->sg_str);
-			old.source_nexthop.interface = up->rpf.source_nexthop.interface;
+			old.source_nexthop.interface =
+				up->rpf.source_nexthop.interface;
 			rpf_result = pim_rpf_update(pim, up, &old, __func__);
 			if (rpf_result == PIM_RPF_CHANGED ||
 					(rpf_result == PIM_RPF_FAILURE &&
 					 old.source_nexthop.interface))
 				pim_zebra_upstream_rpf_changed(pim, up, &old);
 			/* update kernel multicast forwarding cache (MFC) */
-			pim_upstream_mroute_iif_update(up->channel_oil, __func__);
+			pim_upstream_mroute_iif_update(up->channel_oil,
+					__func__);
 		}
 	}
 	pim_zebra_update_all_interfaces(pim);