Traversal cleanup improvement</code shape>