diff --git a/iterator/src/main/java/com/iluwatar/iterator/bst/BstIterator.java b/iterator/src/main/java/com/iluwatar/iterator/bst/BstIterator.java
index a027a286265f..b026f0907c06 100644
--- a/iterator/src/main/java/com/iluwatar/iterator/bst/BstIterator.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/bst/BstIterator.java
@@ -1,27 +1,3 @@
-/*
- * This project is licensed under the MIT license. Module model-view-viewmodel is using ZK framework licensed under LGPL (see lgpl-3.0.txt).
- *
- * The MIT License
- * Copyright © 2014-2022 Ilkka Seppälä
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
 package com.iluwatar.iterator.bst;
 
 import com.iluwatar.iterator.Iterator;
@@ -29,39 +5,43 @@
 import java.util.NoSuchElementException;
 
 /**
- * An in-order implementation of a BST Iterator. For example, given a BST with Integer values,
- * expect to retrieve TreeNodes according to the Integer's natural ordering (1, 2, 3...)
+ * An in-order iterator over a binary search tree. For example, a BST of Integer values yields its
+ * nodes in natural order (1, 2, 3...).
  *
- * @param <T> This Iterator has been implemented with generic typing to allow for TreeNodes of
- *     different value types
+ * <p>Uses O(h) extra space, where h is the height of the tree, by keeping a stack of the nodes
+ * still to be visited. The tree must not be modified during iteration, as this iterator does not
+ * detect such changes.
+ *
+ * @param <T> the type of value stored in the tree nodes
  */
 public class BstIterator<T extends Comparable<T>> implements Iterator<TreeNode<T>> {
 
-  private final ArrayDeque<TreeNode<T>> pathStack;
+  private final ArrayDeque<TreeNode<T>> pathStack = new ArrayDeque<>();
 
+  /**
+   * Creates an iterator positioned at the smallest node.
+   *
+   * @param root the root of the tree, or null for an empty tree
+   */
   public BstIterator(TreeNode<T> root) {
-    pathStack = new ArrayDeque<>();
     pushPathToNextSmallest(root);
   }
 
   /**
-   * This BstIterator manages to use O(h) extra space, where h is the height of the tree It achieves
-   * this by maintaining a stack of the nodes to handle (pushing all left nodes first), before
-   * handling self or right node.
+   * Pushes the given node and all of its left descendants onto the stack.
    *
-   * @param node TreeNode that acts as root of the subtree we're interested in.
+   * @param subtreeRoot the root of the subtree to descend, or null
    */
-  private void pushPathToNextSmallest(TreeNode<T> node) {
-    while (node != null) {
+  private void pushPathToNextSmallest(TreeNode<T> subtreeRoot) {
+    for (var node = subtreeRoot; node != null; node = node.getLeft()) {
       pathStack.push(node);
-      node = node.getLeft();
     }
   }
 
   /**
-   * Checks if there exists next element.
+   * Checks whether another node is available.
    *
-   * @return true if this iterator has a "next" element
+   * @return true if this iterator has a next node
    */
   @Override
   public boolean hasNext() {
@@ -69,18 +49,18 @@ public boolean hasNext() {
   }
 
   /**
-   * Gets the next element.
+   * Returns the next node in in-order traversal.
    *
-   * @return TreeNode next. The next element according to our in-order traversal of the given BST
-   * @throws NoSuchElementException if this iterator does not have a next element
+   * @return the next node
+   * @throws NoSuchElementException if there are no more nodes
    */
   @Override
-  public TreeNode<T> next() throws NoSuchElementException {
+  public TreeNode<T> next() {
     if (pathStack.isEmpty()) {
       throw new NoSuchElementException();
     }
-    var next = pathStack.pop();
-    pushPathToNextSmallest(next.getRight());
-    return next;
+    var current = pathStack.pop();
+    pushPathToNextSmallest(current.getRight());
+    return current;
   }
-}
+}
\ No newline at end of file