diff --git a/cmd/stakercli/transaction/transactions_test.go b/cmd/stakercli/transaction/transactions_test.go
index c2a403e..cd7c143 100644
--- a/cmd/stakercli/transaction/transactions_test.go
+++ b/cmd/stakercli/transaction/transactions_test.go
@@ -186,8 +186,8 @@ func appRunCreatePhase1WithdrawalTx(r *rand.Rand, t *testing.T, app *cli.App, ar
 	return data
 }
 
-func randRange(_ *rand.Rand, minV, maxV int) int {
-	return rand.Intn(maxV+1-minV) + minV
+func randRange(r *rand.Rand, minV, maxV int) int {
+	return r.Intn(maxV+1-minV) + minV
 }
 
 type StakeParameters struct {
diff --git a/itest/testutil/app_cli.go b/itest/testutil/appcli.go
similarity index 100%
rename from itest/testutil/app_cli.go
rename to itest/testutil/appcli.go
diff --git a/staker/stakerapp.go b/staker/stakerapp.go
index 4862594..2886b1a 100644
--- a/staker/stakerapp.go
+++ b/staker/stakerapp.go
@@ -537,6 +537,7 @@ func (app *App) SendPhase1Transaction(
 		return err
 	}
 
+	// pop only works for native segwit address
 	pop, err := app.createPop(stakerAddr)
 	if err != nil {
 		return err