diff --git a/ethexe/cli/src/tests.rs b/ethexe/cli/src/tests.rs
index 5b2bd48d240..14d88497412 100644
--- a/ethexe/cli/src/tests.rs
+++ b/ethexe/cli/src/tests.rs
@@ -519,6 +519,7 @@ mod utils {
         pub block_time: Duration,
 
         network_addresses_nonce: u64,
+        /// In order to reduce amount of observers, we create only one observer and broadcast events to all subscribers.
         broadcaster: Arc<Mutex<Sender<Event>>>,
         _anvil: Option<AnvilInstance>,
         _events_stream: JoinHandle<()>,
@@ -780,9 +781,13 @@ mod utils {
 
     #[derive(Default)]
     pub struct NodeConfig {
+        /// Database, if not provided, will be created with MemDb.
         pub db: Option<Database>,
+        /// Sequencer public key, if provided then new node starts as sequencer.
         pub sequencer_public_key: Option<ethexe_signer::PublicKey>,
+        /// Validator public key, if provided then new node starts as validator.
         pub validator_public_key: Option<ethexe_signer::PublicKey>,
+        /// Network configuration, if provided then new node starts with network.
         pub network: Option<NodeNetworkConfig>,
     }
 
@@ -817,7 +822,9 @@ mod utils {
 
     #[derive(Default)]
     pub struct NodeNetworkConfig {
+        /// Network address, if not provided, will be generated by test env.
         pub address: Option<String>,
+        /// Network bootstrap address, if not provided, then no bootstrap address will be used.
         pub bootstrap_address: Option<String>,
     }
 
@@ -882,6 +889,7 @@ mod utils {
         }
     }
 
+    /// Provides access to hardcoded anvil wallets.
     pub struct AnvilWallets {
         wallets: Vec<ethexe_signer::PublicKey>,
         next_wallet: usize,
diff --git a/ethexe/ethereum/src/router/mod.rs b/ethexe/ethereum/src/router/mod.rs
index 14f3650e134..a4b1b8d19ea 100644
--- a/ethexe/ethereum/src/router/mod.rs
+++ b/ethexe/ethereum/src/router/mod.rs
@@ -168,7 +168,6 @@ impl Router {
         let tx_hash = (*receipt.transaction_hash).into();
         let mut actor_id = None;
 
-        // TODO: return init message id
         for log in receipt.inner.logs() {
             if log.topic0().map(|v| v.0) == Some(signatures::PROGRAM_CREATED.to_fixed_bytes()) {
                 let event = crate::decode_log::<IRouter::ProgramCreated>(log)?;