diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 2a555aae32..046c59aa54 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -9565,9 +9565,9 @@ static int bgp_peer_counts(struct vty *vty, struct peer *peer, afi_t afi,
 	pcounts.table = peer->bgp->rib[afi][safi];
 
 	/* in-place call via thread subsystem so as to record execution time
-	 *    * stats for the thread-walk (i.e. ensure this can't be blamed on
-	 *       * on just vty_read()).
-	 *          */
+	 * stats for the thread-walk (i.e. ensure this can't be blamed on
+	 * on just vty_read()).
+	 */
 	thread_execute(bm->master, bgp_peer_count_walker, &pcounts, 0);
 
 	if (use_json) {
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 747515a870..51709f9ed0 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -895,8 +895,8 @@ struct peer {
 				       memory_order_relaxed)
 
 	/* Statistics field */
-	_Atomic uint32_t open_in;	 /* Open message input count */
-	_Atomic uint32_t open_out;	/* Open message output count */
+	_Atomic uint32_t open_in;         /* Open message input count */
+	_Atomic uint32_t open_out;        /* Open message output count */
 	_Atomic uint32_t update_in;       /* Update message input count */
 	_Atomic uint32_t update_out;      /* Update message ouput count */
 	_Atomic time_t update_time;       /* Update message received time. */