diff --git a/yaserde/src/de/mod.rs b/yaserde/src/de/mod.rs
index 0783526..80687c6 100644
--- a/yaserde/src/de/mod.rs
+++ b/yaserde/src/de/mod.rs
@@ -22,7 +22,7 @@ impl<'de, R: Read> Deserializer<R> {
   pub fn new(reader: EventReader<R>) -> Self {
     Deserializer {
       depth: 0,
-      reader: reader,
+      reader,
       peeked: None,
       is_map_value: false,
     }
@@ -67,13 +67,13 @@ impl<'de, R: Read> Deserializer<R> {
     }
   }
 
-  pub fn next(&mut self) -> Result<XmlEvent, String> {
-    let next = if let Some(peeked) = self.peeked.take() {
+  pub fn next_event(&mut self) -> Result<XmlEvent, String> {
+    let next_event = if let Some(peeked) = self.peeked.take() {
       peeked
     } else {
       self.inner_next()?
     };
-    match next {
+    match next_event {
       XmlEvent::StartElement { .. } => {
         self.depth += 1;
       }
@@ -82,8 +82,8 @@ impl<'de, R: Read> Deserializer<R> {
       }
       _ => {}
     }
-    debug!("Fetched {:?}", next);
-    Ok(next)
+    debug!("Fetched {:?}", next_event);
+    Ok(next_event)
   }
 
   pub fn set_map_value(&mut self) {
@@ -99,21 +99,21 @@ impl<'de, R: Read> Deserializer<R> {
     f: F,
   ) -> Result<T, String> {
     if self.unset_map_value() {
-      if let Ok(XmlEvent::StartElement { name, .. }) = self.next() {
+      if let Ok(XmlEvent::StartElement { name, .. }) = self.next_event() {
         let result = f(self)?;
-        self.expect_end_element(name)?;
+        self.expect_end_element(&name)?;
         Ok(result)
       } else {
-        Err(format!("Internal error: Bad Event"))
+        Err("Internal error: Bad Event".to_string())
       }
     } else {
       f(self)
     }
   }
 
-  pub fn expect_end_element(&mut self, start_name: OwnedName) -> Result<(), String> {
-    if let XmlEvent::EndElement { name, .. } = self.next()? {
-      if name == start_name {
+  pub fn expect_end_element(&mut self, start_name: &OwnedName) -> Result<(), String> {
+    if let XmlEvent::EndElement { name, .. } = self.next_event()? {
+      if name == *start_name {
         Ok(())
       } else {
         Err(format!(
@@ -122,10 +122,10 @@ impl<'de, R: Read> Deserializer<R> {
         ))
       }
     } else {
-      Err(String::from(format!(
+      Err(format!(
         "Unexpected token </{}>",
         start_name.local_name
-      )))
+      ))
     }
   }
 }
diff --git a/yaserde/src/ser/mod.rs b/yaserde/src/ser/mod.rs
index 3a93261..d152b5a 100644
--- a/yaserde/src/ser/mod.rs
+++ b/yaserde/src/ser/mod.rs
@@ -47,7 +47,7 @@ pub struct Serializer<W: Write> {
 impl<'de, W: Write> Serializer<W> {
   pub fn new(writer: EventWriter<W>) -> Self {
     Serializer {
-      writer: writer,
+      writer,
       skip_start_end: false,
     }
   }
diff --git a/yaserde_derive/src/de/expand_enum.rs b/yaserde_derive/src/de/expand_enum.rs
index 69e08c0..fcc5093 100644
--- a/yaserde_derive/src/de/expand_enum.rs
+++ b/yaserde_derive/src/de/expand_enum.rs
@@ -236,7 +236,7 @@ pub fn parse(
             XmlEvent::StartElement{name, attributes, namespace: _namespace} => {
               debug!("Enum: {}: {}", named_element, name.local_name.as_str());
               if name.local_name == named_element {
-                let _next = reader.next();
+                let _next = reader.next_event();
 
                 if let XmlEvent::Characters(content) = reader.peek()?.to_owned() {
                   match content.as_str() {
@@ -250,10 +250,10 @@ pub fn parse(
               if name.local_name.as_str() == named_element {
                 break;
               }
-              let _root = reader.next();
+              let _root = reader.next_event();
             },
             xml::reader::XmlEvent::Characters(characters_content) => {
-              let _root = reader.next();
+              let _root = reader.next_event();
             },
             event => {
               return Err(format!("unknown event {:?}", event))
diff --git a/yaserde_derive/src/de/expand_struct.rs b/yaserde_derive/src/de/expand_struct.rs
index 11f14ef..3fd1b08 100644
--- a/yaserde_derive/src/de/expand_struct.rs
+++ b/yaserde_derive/src/de/expand_struct.rs
@@ -392,7 +392,7 @@ pub fn parse(
             match #struct_name::deserialize(reader) {
               Ok(parsed_item) => {
                 #label = parsed_item;
-                let _root = reader.next();
+                let _root = reader.next_event();
               },
               Err(msg) => {
                 return Err(msg);
@@ -521,7 +521,7 @@ pub fn parse(
                   match #struct_ident::deserialize(reader) {
                     Ok(parsed_item) => {
                       #label.push(parsed_item);
-                      let _root = reader.next();
+                      let _root = reader.next_event();
                     },
                     Err(msg) => {
                       return Err(msg);
@@ -713,7 +713,7 @@ pub fn parse(
               match name.local_name.as_str() {
                 #call_visitors
                 named_element => {
-                  let _root = reader.next();
+                  let _root = reader.next_event();
                 }
                 // name => {
                 //   return Err(format!("unknown key {}", name))
@@ -725,11 +725,11 @@ pub fn parse(
               if name.local_name == named_element {
                 break;
               }
-              let _root = reader.next();
+              let _root = reader.next_event();
             }
             XmlEvent::Characters(ref text_content) => {
               #set_text
-              let _root = reader.next();
+              let _root = reader.next_event();
             }
             event => {
               return Err(format!("unknown event {:?}", event))
@@ -793,7 +793,7 @@ fn build_call_visitor(
           return visitor.#visitor("");
         }
 
-        if let Ok(XmlEvent::Characters(s)) = reader.next() {
+        if let Ok(XmlEvent::Characters(s)) = reader.next_event() {
           visitor.#visitor(&s)
         } else {
           Err(format!("unable to parse content for {}", #label_name))