diff --git a/blockchain/stake/staketx.go b/blockchain/stake/staketx.go
index d941ad23..115440bf 100644
--- a/blockchain/stake/staketx.go
+++ b/blockchain/stake/staketx.go
@@ -671,7 +671,7 @@ func CalculateRevocationRewards(contribAmounts []int64, ticketPurchaseAmount int
 		prng := NewHash256PRNG(prevHeaderBytes)
 		for i := int64(0); i < remainder; i++ {
 			returnIndex := prng.UniformRandom(numReturnAmounts)
-			returnAmounts[returnIndex] += 1
+			returnAmounts[returnIndex]++
 		}
 	}
 
diff --git a/blockchain/stake/treasury_test.go b/blockchain/stake/treasury_test.go
index e8ef3c47..282e1568 100644
--- a/blockchain/stake/treasury_test.go
+++ b/blockchain/stake/treasury_test.go
@@ -24,7 +24,7 @@ import (
 // Private and public keys for tests.
 var (
 	// Serialized private key.
-	//privateKey []byte = []byte{
+	//privateKey = []byte{
 	//	0x76, 0x87, 0x56, 0x13, 0x94, 0xcc, 0xc6, 0x11,
 	//	0x01, 0x51, 0xbd, 0x9f, 0x26, 0xd4, 0x22, 0x8e,
 	//	0xb2, 0xd5, 0x7b, 0xe1, 0x28, 0xc0, 0x36, 0x12,
@@ -32,7 +32,7 @@ var (
 	//}
 
 	// Serialized compressed public key
-	publicKey []byte = []byte{
+	publicKey = []byte{
 		0x02, 0xa4, 0xf6, 0x45, 0x86, 0xe1, 0x72, 0xc3,
 		0xd9, 0xa2, 0x0c, 0xfa, 0x6c, 0x7a, 0xc8, 0xfb,
 		0x12, 0xf0, 0x11, 0x5b, 0x3f, 0x69, 0xc3, 0xc3,
@@ -41,7 +41,7 @@ var (
 	}
 
 	// Valid signature of chainhash.HashB([]byte("test message"))
-	validSignature []byte = []byte{
+	validSignature = []byte{
 		0x77, 0x69, 0x84, 0xf6, 0x83, 0x13, 0xb1, 0xac,
 		0x62, 0x9e, 0x62, 0x4a, 0xf0, 0x59, 0x5b, 0xdc,
 		0x09, 0xd8, 0xde, 0xd0, 0x2b, 0xc2, 0xb2, 0x9f,
@@ -53,7 +53,7 @@ var (
 	}
 
 	// OP_DATA_64 <signature> <pikey> OP_TSPEND
-	tspendValidKey []byte = []byte{
+	tspendValidKey = []byte{
 		0x40, // OP_DATA_64 valid signature
 		0x77, 0x69, 0x84, 0xf6, 0x83, 0x13, 0xb1, 0xac,
 		0x62, 0x9e, 0x62, 0x4a, 0xf0, 0x59, 0x5b, 0xdc,
@@ -73,7 +73,7 @@ var (
 	}
 
 	// OP_DATA_64 <signature> <pikey>
-	tspendNoTSpend []byte = []byte{
+	tspendNoTSpend = []byte{
 		0x40, // OP_DATA_64 valid signature
 		0x77, 0x69, 0x84, 0xf6, 0x83, 0x13, 0xb1, 0xac,
 		0x62, 0x9e, 0x62, 0x4a, 0xf0, 0x59, 0x5b, 0xdc,
@@ -92,7 +92,7 @@ var (
 	}
 
 	// OP_DATA_64 <signature> <pikey> OP_TSPEND OP_TSPEND
-	tspendTwoTSpend []byte = []byte{
+	tspendTwoTSpend = []byte{
 		0x40, // OP_DATA_64 valid signature
 		0x77, 0x69, 0x84, 0xf6, 0x83, 0x13, 0xb1, 0xac,
 		0x62, 0x9e, 0x62, 0x4a, 0xf0, 0x59, 0x5b, 0xdc,
@@ -113,7 +113,7 @@ var (
 	}
 
 	// OP_DATA_64 <signature> <pikey> OP_TSPEND OP_DATA_1
-	tspendTrailingData []byte = []byte{
+	tspendTrailingData = []byte{
 		0x40, // OP_DATA_64 valid signature
 		0x77, 0x69, 0x84, 0xf6, 0x83, 0x13, 0xb1, 0xac,
 		0x62, 0x9e, 0x62, 0x4a, 0xf0, 0x59, 0x5b, 0xdc,