diff --git a/simulation/simulation_test.go b/simulation/simulation_test.go
index c12b241654..6309753011 100644
--- a/simulation/simulation_test.go
+++ b/simulation/simulation_test.go
@@ -458,7 +458,7 @@ func TestAppImportExport(t *testing.T) {
 // 1. It runs a full simulation and exports the state
 // 2. It creates a new app, and db
 // 3. It imports the exported state into the new app
-// 4. It runs a simulation on the new app and verifies that there is error in the second simulation
+// 4. It runs a simulation on the new app and verifies that there is no error in the second simulation
 func TestAppSimulationAfterImport(t *testing.T) {
 	config := zetasimulation.NewConfigFromFlags()
 
@@ -587,5 +587,5 @@ func TestAppSimulationAfterImport(t *testing.T) {
 		config,
 		simApp.AppCodec(),
 	)
-	require.NoError(t, err)
+	require.NoError(t, simErr)
 }
diff --git a/x/crosschain/simulation/operations_test.go b/x/crosschain/simulation/operations_test.go
deleted file mode 100644
index 40ee2dd534..0000000000
--- a/x/crosschain/simulation/operations_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package simulation_test
-
-import (
-	"math"
-	"math/rand"
-	"testing"
-
-	"github.com/zeta-chain/node/x/crosschain/simulation"
-)
-
-func Test_Matrix(t *testing.T) {
-	r := rand.New(rand.NewSource(42))
-	numVotes := 10
-	for i := 0; i < 10; i++ {
-
-		ballotVotesTransitionMatrix, yesVotePercentageArray, ballotVotesState := simulation.BallotVoteSimulationMatrix()
-		ballotVotesState = ballotVotesTransitionMatrix.NextState(r, ballotVotesState)
-		yesVotePercentage := yesVotePercentageArray[ballotVotesState]
-		numberOfYesVotes := int(math.Ceil(float64(numVotes) * yesVotePercentage))
-
-		t.Logf("Yes Vote Percentage: %v, Number of Yes votes %d", yesVotePercentage, numberOfYesVotes)
-	}
-}
diff --git a/x/observer/keeper/msg_server_update_observer.go b/x/observer/keeper/msg_server_update_observer.go
index ec40b34294..7bf02e1b1c 100644
--- a/x/observer/keeper/msg_server_update_observer.go
+++ b/x/observer/keeper/msg_server_update_observer.go
@@ -75,7 +75,7 @@ func (k msgServer) UpdateObserver(
 	if lastBlockCount.Count != totalObserverCountCurrentBlock {
 		return nil, errorsmod.Wrapf(
 			types.ErrUpdateObserver,
-			"Observer count mismatch current block : %d , last block : %d",
+			"Observer count mismatch current block: %d , last block: %d",
 			totalObserverCountCurrentBlock,
 			lastBlockCount.Count,
 		)
diff --git a/x/observer/keeper/tss.go b/x/observer/keeper/tss.go
index 97de7e8d0f..92db492352 100644
--- a/x/observer/keeper/tss.go
+++ b/x/observer/keeper/tss.go
@@ -66,7 +66,6 @@ func (k Keeper) RemoveTSS(ctx sdk.Context) {
 	store.Delete([]byte{0})
 }
 
-// TODO define a type for a list of TSS isntead of using []types.TSS
 // GetAllTSS returns all tss historical information from the store
 func (k Keeper) GetAllTSS(ctx sdk.Context) (list []types.TSS) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.TSSHistoryKey))