diff --git a/eth/api_backend.go b/eth/api_backend.go
index 02d1946e8..80f5bcee6 100644
--- a/eth/api_backend.go
+++ b/eth/api_backend.go
@@ -294,7 +294,7 @@ func (b *EthAPIBackend) SubscribeLogsEvent(ch chan<- []*types.Log) event.Subscri
 }
 
 func (b *EthAPIBackend) SendTx(ctx context.Context, signedTx *types.Transaction) error {
-	return b.eth.txPool.Add([]*txpool.Transaction{&txpool.Transaction{Tx: signedTx}}, true, false)[0]
+	return b.eth.txPool.Add([]*txpool.Transaction{{Tx: signedTx}}, true, false)[0]
 }
 
 func (b *EthAPIBackend) GetPoolTransactions() (types.Transactions, error) {
diff --git a/miner/payload_building_test.go b/miner/payload_building_test.go
index b2f1d68f3..6f5736344 100644
--- a/miner/payload_building_test.go
+++ b/miner/payload_building_test.go
@@ -84,48 +84,48 @@ func TestBuildPayload(t *testing.T) {
 func TestPayloadId(t *testing.T) {
 	ids := make(map[string]int)
 	for i, tt := range []*BuildPayloadArgs{
-		&BuildPayloadArgs{
+		{
 			Parent:       common.Hash{1},
 			Timestamp:    1,
 			Random:       common.Hash{0x1},
 			FeeRecipient: common.Address{0x1},
 		},
 		// Different parent
-		&BuildPayloadArgs{
+		{
 			Parent:       common.Hash{2},
 			Timestamp:    1,
 			Random:       common.Hash{0x1},
 			FeeRecipient: common.Address{0x1},
 		},
 		// Different timestamp
-		&BuildPayloadArgs{
+		{
 			Parent:       common.Hash{2},
 			Timestamp:    2,
 			Random:       common.Hash{0x1},
 			FeeRecipient: common.Address{0x1},
 		},
 		// Different Random
-		&BuildPayloadArgs{
+		{
 			Parent:       common.Hash{2},
 			Timestamp:    2,
 			Random:       common.Hash{0x2},
 			FeeRecipient: common.Address{0x1},
 		},
 		// Different fee-recipient
-		&BuildPayloadArgs{
+		{
 			Parent:       common.Hash{2},
 			Timestamp:    2,
 			Random:       common.Hash{0x2},
 			FeeRecipient: common.Address{0x2},
 		},
 		// Different withdrawals (non-empty)
-		&BuildPayloadArgs{
+		{
 			Parent:       common.Hash{2},
 			Timestamp:    2,
 			Random:       common.Hash{0x2},
 			FeeRecipient: common.Address{0x2},
 			Withdrawals: []*types.Withdrawal{
-				&types.Withdrawal{
+				{
 					Index:     0,
 					Validator: 0,
 					Address:   common.Address{},
@@ -134,13 +134,13 @@ func TestPayloadId(t *testing.T) {
 			},
 		},
 		// Different withdrawals (non-empty)
-		&BuildPayloadArgs{
+		{
 			Parent:       common.Hash{2},
 			Timestamp:    2,
 			Random:       common.Hash{0x2},
 			FeeRecipient: common.Address{0x2},
 			Withdrawals: []*types.Withdrawal{
-				&types.Withdrawal{
+				{
 					Index:     2,
 					Validator: 0,
 					Address:   common.Address{},