diff --git a/CHANGELOG.md b/CHANGELOG.md
index b90a52704..eded412a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,6 @@ FEATURES:
 - Tooling to run multiple blockchains/apps, possibly in a single process
 - State syncing (without transaction replay)
 - Add authentication and rate-limitting to the RPC
-- new unsubscribe_all WebSocket RPC endpoint
 
 IMPROVEMENTS:
 - Improve subtleties around mempool caching and logic
diff --git a/consensus/reactor.go b/consensus/reactor.go
index f18c3c39d..e9bc9c1b2 100644
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -57,7 +57,7 @@ func (conR *ConsensusReactor) OnStart() error {
 	conR.Logger.Info("ConsensusReactor ", "fastSync", conR.FastSync())
 	conR.BaseReactor.OnStart()
 
-	err := conR.broadcastRoutine()
+	err := conR.startBroadcastRoutine()
 	if err != nil {
 		return err
 	}
@@ -325,10 +325,10 @@ func (conR *ConsensusReactor) FastSync() bool {
 
 //--------------------------------------
 
-// broadcastRoutine subscribes for new round steps, votes and proposal
-// heartbeats using the event bus and broadcasts events to peers upon receiving
-// them.
-func (conR *ConsensusReactor) broadcastRoutine() error {
+// startBroadcastRoutine subscribes for new round steps, votes and proposal
+// heartbeats using the event bus and starts a go routine to broadcasts events
+// to peers upon receiving them.
+func (conR *ConsensusReactor) startBroadcastRoutine() error {
 	const subscriber = "consensus-reactor"
 	ctx := context.Background()
 
diff --git a/types/event_buffer.go b/types/event_buffer.go
index 84f855372..6f236e8ef 100644
--- a/types/event_buffer.go
+++ b/types/event_buffer.go
@@ -3,7 +3,7 @@ package types
 // Interface assertions
 var _ TxEventPublisher = (*TxEventBuffer)(nil)
 
-// TxEventBuffer is a buffer of events, which uses a slice to temporary store
+// TxEventBuffer is a buffer of events, which uses a slice to temporarily store
 // events.
 type TxEventBuffer struct {
 	next     TxEventPublisher
@@ -11,7 +11,7 @@ type TxEventBuffer struct {
 	events   []EventDataTx
 }
 
-// NewTxEventBuffer accepts an EventBus and returns a new buffer with the given
+// NewTxEventBuffer accepts a TxEventPublisher and returns a new buffer with the given
 // capacity.
 func NewTxEventBuffer(next TxEventPublisher, capacity int) *TxEventBuffer {
 	return &TxEventBuffer{
diff --git a/types/events.go b/types/events.go
index ef9b5f98b..64b83ec95 100644
--- a/types/events.go
+++ b/types/events.go
@@ -42,7 +42,7 @@ var (
 	EventDataNameTx                = "tx"
 	EventDataNameRoundState        = "round_state"
 	EventDataNameVote              = "vote"
-	EventDataNameProposalHeartbeat = "proposer_heartbeat"
+	EventDataNameProposalHeartbeat = "proposal_heartbeat"
 )
 
 // implements events.EventData