diff --git a/src/day07.rs b/src/day07.rs
index 9db0597..f986607 100644
--- a/src/day07.rs
+++ b/src/day07.rs
@@ -71,14 +71,12 @@ fn input_generator(input: &str) -> Vec<CliOperation> {
     ops
 }
 
-fn compute_dir_sizes(input: &[CliOperation]) -> Tree<(usize, usize)> {
+fn compute_dir_sizes(input: &[CliOperation]) -> Tree<usize> {
     if input[0] != CliOperation::Cd("/".to_string()) {
         panic!();
     }
     let mut tree = Tree::new();
-    let mut current_node = tree
-        .insert(Node::new((0, 0)), InsertBehavior::AsRoot)
-        .unwrap();
+    let mut current_node = tree.insert(Node::new(0), InsertBehavior::AsRoot).unwrap();
     for op in input {
         match op {
             CliOperation::Cd(dir) => {
@@ -86,34 +84,30 @@ fn compute_dir_sizes(input: &[CliOperation]) -> Tree<(usize, usize)> {
                     current_node = tree.get(&current_node).unwrap().parent().unwrap().clone();
                 } else {
                     current_node = tree
-                        .insert(Node::new((0, 0)), InsertBehavior::UnderNode(&current_node))
+                        .insert(Node::new(0), InsertBehavior::UnderNode(&current_node))
                         .unwrap();
                 };
             }
             CliOperation::Ls(entries) => {
-                *tree.get_mut(&current_node).unwrap().data_mut() = (
-                    entries
-                        .iter()
-                        .filter_map(DirectoryEntry::as_file)
-                        .map(|file| file.size)
-                        .sum::<usize>(),
-                    0,
-                )
+                *tree.get_mut(&current_node).unwrap().data_mut() = entries
+                    .iter()
+                    .filter_map(DirectoryEntry::as_file)
+                    .map(|file| file.size)
+                    .sum::<usize>();
             }
         }
     }
-    let post_order_ids = tree
+    for id in tree
         .traverse_post_order_ids(tree.root_node_id().unwrap())
         .unwrap()
-        .collect::<Vec<_>>();
-    for id in post_order_ids {
+    {
         let child_sum = tree
             .children(&id)
             .unwrap()
-            .map(|node| node.data().1)
+            .map(|node| node.data())
             .sum::<usize>();
-        let self_sum = tree.get(&id).unwrap().data().0;
-        tree.get_mut(&id).unwrap().data_mut().1 = child_sum + self_sum;
+        let self_sum = tree.get(&id).unwrap().data();
+        *tree.get_mut(&id).unwrap().data_mut() = child_sum + self_sum;
     }
     tree
 }
@@ -123,7 +117,7 @@ fn solve_part1(input: &[CliOperation]) -> usize {
     let tree = compute_dir_sizes(input);
     tree.traverse_post_order(tree.root_node_id().unwrap())
         .unwrap()
-        .map(|node| node.data().1)
+        .map(|node| *node.data())
         .filter(|&size| size <= 100_000)
         .sum()
 }
@@ -131,11 +125,11 @@ fn solve_part1(input: &[CliOperation]) -> usize {
 #[aoc(day7, part2)]
 fn solve_part2(input: &[CliOperation]) -> usize {
     let tree = compute_dir_sizes(input);
-    let free_space = 70_000_000 - tree.get(tree.root_node_id().unwrap()).unwrap().data().1;
+    let free_space = 70_000_000 - tree.get(tree.root_node_id().unwrap()).unwrap().data();
     let necessary_to_free = 30_000_000 - free_space;
     tree.traverse_post_order(tree.root_node_id().unwrap())
         .unwrap()
-        .map(|node| node.data().1)
+        .map(|node| *node.data())
         .filter(|&size| size >= necessary_to_free)
         .min()
         .unwrap()