diff --git a/src/main.rs b/src/main.rs
index a275170..ec12590 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -126,7 +126,7 @@ async fn get_folder_contents(url_tail: &String) -> Result<String, Box<dyn std::e
 }
 
 #[tokio::main]
-async fn traverse(result: &Multistatus) {
+async fn traverse(mut result: Multistatus) {
     debug!("Entering: traverse()");
     // Initialize the indexed "pointer"
     let mut current_index: usize = 0;
@@ -134,7 +134,7 @@ async fn traverse(result: &Multistatus) {
     // Initialize the hashmap of visited items (by etag?)
     let mut visited_items = HashMap::new();
     // match result.response[0].propstat[0].prop {
-    match result.response.into_iter().nth(0).unwrap()
+    match &result.response.into_iter().nth(0).unwrap()
         .propstat.into_iter().nth(0).unwrap().prop {
         Some(prop) => match prop.get_etag {
             Some(etag) => {
@@ -149,14 +149,12 @@ async fn traverse(result: &Multistatus) {
     while !result.response.is_empty() {
         match &result.response[current_index].propstat[0].prop {
             Some(prop) => {
-                match &prop.get_etag {
+                match prop.get_etag {
                     Some(etag) => {
                         // If result.response[current_index] has not been visited
-                        if !visited_items.contains_key(etag) {
+                        if !visited_items.contains_key(&etag) {
                             // If item is a collection
-                            // TODO(amcooper): Again, replace unwrap with the match implementation,
-                            // or find another way to handle these structures.
-                            match &prop.resource_type {
+                            match prop.resource_type {
                                 Some(resource_type) => {
                                     if !resource_type.collection.is_empty() {
                                         // Get the contents XML
@@ -169,7 +167,7 @@ async fn traverse(result: &Multistatus) {
                                         // Parse the contents XML into Multistatus
                                         let mut new_result: Multistatus = from_str(&String::from(folder_contents)).unwrap();
                                         // Append the NextcloudResponse vector to result.response
-                                        result.response.append(&new_result.response);
+                                        result.response.append(&mut new_result.response);
                                     }
                                 }
                                 _ => current_index += 1,
@@ -228,6 +226,6 @@ async fn main() -> std::io::Result<()> {
     let mut result: Multistatus = from_str(&folder_contents).unwrap();
     println!("{:?}", result);
 
-    traverse(&result);
+    traverse(result);
     Ok(())
 }