diff --git a/ntex-router/src/tree.rs b/ntex-router/src/tree.rs
index 0c4ea398..6c729b55 100644
--- a/ntex-router/src/tree.rs
+++ b/ntex-router/src/tree.rs
@@ -265,7 +265,7 @@ impl Tree {
                         base_skip,
                     )
                 })
-                .filter_map(|x| x)
+                .flatten()
                 .next();
 
             return if let Some((val, skip)) = res {
@@ -519,7 +519,7 @@ impl Tree {
                                                     base_skip,
                                                 )
                                             })
-                                            .filter_map(|x| x)
+                                            .flatten()
                                             .next()
                                         {
                                             return Some(res);
@@ -559,7 +559,7 @@ impl Tree {
                                 base_skip,
                             )
                         })
-                        .filter_map(|x| x)
+                        .flatten()
                         .next();
                 } else {
                     path = &path[idx + 1..];
diff --git a/ntex-service/src/map_err.rs b/ntex-service/src/map_err.rs
index ed29c5b2..9e6915ba 100644
--- a/ntex-service/src/map_err.rs
+++ b/ntex-service/src/map_err.rs
@@ -184,7 +184,7 @@ where
     F: Fn(A::Error) -> E,
 {
     fn new(fut: A::Future, f: F) -> Self {
-        MapErrServiceFuture { f, fut }
+        MapErrServiceFuture { fut, f }
     }
 }
 
diff --git a/ntex/src/framed/write.rs b/ntex/src/framed/write.rs
index c5e7e407..a069bc62 100644
--- a/ntex/src/framed/write.rs
+++ b/ntex/src/framed/write.rs
@@ -53,7 +53,7 @@ where
             Shutdown::None,
         );
 
-        Self { io, st, state }
+        Self { st, io, state }
     }
 }
 
@@ -165,7 +165,7 @@ where
 
                     // disconnect timeout
                     if let Some(ref mut delay) = delay {
-                        if let Poll::Pending = Pin::new(delay).poll(cx) {
+                        if Pin::new(delay).poll(cx).is_pending() {
                             return Poll::Pending;
                         }
                     }
diff --git a/ntex/src/http/client/ws.rs b/ntex/src/http/client/ws.rs
index c8dc18aa..a33c57da 100644
--- a/ntex/src/http/client/ws.rs
+++ b/ntex/src/http/client/ws.rs
@@ -419,8 +419,8 @@ where
 
         Self {
             io,
-            codec,
             state,
+            codec,
             res,
         }
     }
diff --git a/ntex/src/http/h1/service.rs b/ntex/src/http/h1/service.rs
index d4735310..b2f92241 100644
--- a/ntex/src/http/h1/service.rs
+++ b/ntex/src/http/h1/service.rs
@@ -425,11 +425,7 @@ where
     }
 
     fn call(&self, (io, addr): Self::Request) -> Self::Future {
-        let on_connect = if let Some(ref on_connect) = self.on_connect {
-            Some(on_connect(&io))
-        } else {
-            None
-        };
+        let on_connect = self.on_connect.as_ref().map(|f| f(&io));
 
         Dispatcher::new(io, self.config.clone(), addr, on_connect)
     }
diff --git a/ntex/src/http/h2/service.rs b/ntex/src/http/h2/service.rs
index dbaf857f..dbab947c 100644
--- a/ntex/src/http/h2/service.rs
+++ b/ntex/src/http/h2/service.rs
@@ -260,17 +260,11 @@ where
     fn call(&self, (io, addr): Self::Request) -> Self::Future {
         trace!("New http2 connection, peer address: {:?}", addr);
 
-        let on_connect = if let Some(ref on_connect) = self.on_connect {
-            Some(on_connect(&io))
-        } else {
-            None
-        };
-
         H2ServiceHandlerResponse {
             state: State::Handshake(
                 self.config.clone(),
                 addr,
-                on_connect,
+                self.on_connect.as_ref().map(|f| f(&io)),
                 server::handshake(io),
             ),
         }
diff --git a/ntex/src/http/service.rs b/ntex/src/http/service.rs
index f3d9e53b..111aa92d 100644
--- a/ntex/src/http/service.rs
+++ b/ntex/src/http/service.rs
@@ -509,11 +509,7 @@ where
             proto,
             peer_addr
         );
-        let on_connect = if let Some(ref on_connect) = self.on_connect {
-            Some(on_connect(&io))
-        } else {
-            None
-        };
+        let on_connect = self.on_connect.as_ref().map(|f| f(&io));
 
         match proto {
             Protocol::Http2 => HttpServiceHandlerResponse {
diff --git a/ntex/src/server/accept.rs b/ntex/src/server/accept.rs
index 602316f4..839b8b37 100644
--- a/ntex/src/server/accept.rs
+++ b/ntex/src/server/accept.rs
@@ -331,7 +331,7 @@ impl Accept {
             self.backpressure = true;
             for (_, info) in self.sockets.iter_mut() {
                 // disable err timeout
-                if let None = info.timeout.take() {
+                if info.timeout.take().is_none() {
                     trace!("Enabling backpressure for {}", info.addr);
                     let _ = self.poll.registry().deregister(&mut info.sock);
                 }
diff --git a/ntex/src/util/stream.rs b/ntex/src/util/stream.rs
index e3344bdc..cc14c60d 100644
--- a/ntex/src/util/stream.rs
+++ b/ntex/src/util/stream.rs
@@ -72,7 +72,7 @@ where
                     }
                 });
             }
-            if let Poll::Pending = this.service.poll_shutdown(cx, *is_err) {
+            if this.service.poll_shutdown(cx, *is_err).is_pending() {
                 return Poll::Pending;
             }
             return Poll::Ready(());
diff --git a/ntex/src/web/config.rs b/ntex/src/web/config.rs
index a0690293..ba2f016d 100644
--- a/ntex/src/web/config.rs
+++ b/ntex/src/web/config.rs
@@ -21,7 +21,7 @@ struct AppConfigInner {
 
 impl AppConfig {
     pub(crate) fn new(secure: bool, addr: SocketAddr, host: String) -> Self {
-        AppConfig(Rc::new(AppConfigInner { secure, addr, host }))
+        AppConfig(Rc::new(AppConfigInner { secure, host, addr }))
     }
 
     /// Server host name.
diff --git a/ntex/src/web/httprequest.rs b/ntex/src/web/httprequest.rs
index 46757952..d0779ebe 100644
--- a/ntex/src/web/httprequest.rs
+++ b/ntex/src/web/httprequest.rs
@@ -41,9 +41,9 @@ impl HttpRequest {
             head,
             path,
             payload,
+            app_data,
             rmap,
             config,
-            app_data,
             pool,
         }))
     }
@@ -218,11 +218,7 @@ impl HttpRequest {
     /// let opt_t = req.app_data::<Data<T>>();
     /// ```
     pub fn app_data<T: 'static>(&self) -> Option<&T> {
-        if let Some(st) = self.0.app_data.get::<T>() {
-            Some(&st)
-        } else {
-            None
-        }
+        self.0.app_data.get::<T>()
     }
 }
 
@@ -322,11 +318,7 @@ impl HttpRequestPool {
     /// Get message from the pool
     #[inline]
     pub(crate) fn get_request(&self) -> Option<HttpRequest> {
-        if let Some(inner) = self.0.borrow_mut().pop() {
-            Some(HttpRequest(inner))
-        } else {
-            None
-        }
+        self.0.borrow_mut().pop().map(HttpRequest)
     }
 
     pub(crate) fn clear(&self) {
diff --git a/ntex/src/web/middleware/compress.rs b/ntex/src/web/middleware/compress.rs
index eacd3a0f..0bd131ae 100644
--- a/ntex/src/web/middleware/compress.rs
+++ b/ntex/src/web/middleware/compress.rs
@@ -206,13 +206,11 @@ impl AcceptEncoding {
             .collect();
         encodings.sort();
 
-        for enc in encodings {
-            if let Some(enc) = enc {
-                if encoding == ContentEncoding::Auto {
-                    return enc.encoding;
-                } else if encoding == enc.encoding {
-                    return encoding;
-                }
+        for enc in encodings.into_iter().flatten() {
+            if encoding == ContentEncoding::Auto {
+                return enc.encoding;
+            } else if encoding == enc.encoding {
+                return encoding;
             }
         }
         ContentEncoding::Identity
diff --git a/ntex/src/web/test.rs b/ntex/src/web/test.rs
index e499d8aa..4c03e5bf 100644
--- a/ntex/src/web/test.rs
+++ b/ntex/src/web/test.rs
@@ -759,10 +759,10 @@ where
     };
 
     TestServer {
-        ssl,
         addr,
         client,
         system,
+        ssl,
         server,
     }
 }
diff --git a/ntex/src/web/util.rs b/ntex/src/web/util.rs
index 50705e99..c276d786 100644
--- a/ntex/src/web/util.rs
+++ b/ntex/src/web/util.rs
@@ -310,11 +310,7 @@ pub trait BodyEncoding {
 
 impl BodyEncoding for HttpResponseBuilder {
     fn get_encoding(&self) -> Option<ContentEncoding> {
-        if let Some(ref enc) = self.extensions().get::<Enc>() {
-            Some(enc.0)
-        } else {
-            None
-        }
+        self.extensions().get::<Enc>().as_ref().map(|enc| enc.0)
     }
 
     fn encoding(&mut self, encoding: ContentEncoding) -> &mut Self {
@@ -325,11 +321,7 @@ impl BodyEncoding for HttpResponseBuilder {
 
 impl<B> BodyEncoding for HttpResponse<B> {
     fn get_encoding(&self) -> Option<ContentEncoding> {
-        if let Some(ref enc) = self.extensions().get::<Enc>() {
-            Some(enc.0)
-        } else {
-            None
-        }
+        self.extensions().get::<Enc>().as_ref().map(|enc| enc.0)
     }
 
     fn encoding(&mut self, encoding: ContentEncoding) -> &mut Self {