diff --git a/beacond/cmd/defaults.go b/beacond/cmd/defaults.go
index fdc0bb83ba..148fc79972 100644
--- a/beacond/cmd/defaults.go
+++ b/beacond/cmd/defaults.go
@@ -65,7 +65,7 @@ func DefaultComponents() []any {
 			*AvailabilityStore, *BeaconBlock, *BeaconBlockBody,
 			*BeaconBlockHeader, *BeaconState, *BeaconStateMarshallable,
 			*BlobSidecars, *BlockStore, *Deposit, *DepositStore,
-			*ExecutionPayload, *ExecutionPayloadHeader, *Log, *Genesis,
+			*ExecutionPayload, *ExecutionPayloadHeader, Log, *Genesis,
 			*KVStore, *Logger, *StorageBackend,
 		],
 		components.ProvideNode,
@@ -96,15 +96,15 @@ func DefaultComponents() []any {
 			*BeaconBlock, *BlobSidecars, *Genesis, *Logger,
 		],
 		components.ProvideEngineClient[
-			*ExecutionPayload, *ExecutionPayloadHeader, *Log, *Logger,
+			*ExecutionPayload, *ExecutionPayloadHeader, Log, *Logger,
 		],
 		components.ProvideExecutionEngine[
-			*ExecutionPayload, *ExecutionPayloadHeader, *Log, *Logger,
+			*ExecutionPayload, *ExecutionPayloadHeader, Log, *Logger,
 		],
 		components.ProvideJWTSecret,
 		components.ProvideLocalBuilder[
 			*BeaconBlockHeader, *BeaconState, *BeaconStateMarshallable,
-			*ExecutionPayload, *ExecutionPayloadHeader, *Log, *KVStore, *Logger,
+			*ExecutionPayload, *ExecutionPayloadHeader, Log, *KVStore, *Logger,
 		],
 		components.ProvideReportingService[*Logger],
 		components.ProvideCometBFTService[*Logger],
diff --git a/mod/consensus-types/pkg/types/deposit.go b/mod/consensus-types/pkg/types/deposit.go
index 092fc1231a..fae0d35f17 100644
--- a/mod/consensus-types/pkg/types/deposit.go
+++ b/mod/consensus-types/pkg/types/deposit.go
@@ -198,11 +198,9 @@ func (d *Deposit[_]) GetTree() (*fastssz.Node, error) {
 // UnmarshalLog unmarshals the Deposit object from an Ethereum log.
 func (d *Deposit[LogT]) UnmarshalLog(log LogT) error {
 	data := log.GetData()
-	idx := binary.BigEndian.Uint64(data[152:160])
-	d.Index = idx
+	d.Index = binary.BigEndian.Uint64(data[152:160])
 	d.Pubkey = bytes.B48(data[208:256])
-	amount := binary.BigEndian.Uint64(data[280:288])
-	d.Amount = math.U64(amount)
+	d.Amount = math.U64(binary.BigEndian.Uint64(data[280:288]))
 	d.Credentials = WithdrawalCredentials(bytes.B32(data[288:320]))
 	d.Signature = bytes.B96(data[352:448])
 	return nil
diff --git a/mod/execution/pkg/engine/engine.go b/mod/execution/pkg/engine/engine.go
index e4ec8a074f..970ecc90cd 100644
--- a/mod/execution/pkg/engine/engine.go
+++ b/mod/execution/pkg/engine/engine.go
@@ -69,7 +69,7 @@ func New[
 	logger log.Logger,
 	telemtrySink TelemetrySink,
 ) *Engine[
-	ExecutionPayloadT, LogT,PayloadAttributesT,
+	ExecutionPayloadT, LogT, PayloadAttributesT,
 	PayloadIDT, WithdrawalsT,
 ] {
 	return &Engine[