diff --git a/src/bit_mask.rs b/src/bit_mask.rs
index c2fd37420..133212daf 100644
--- a/src/bit_mask.rs
+++ b/src/bit_mask.rs
@@ -148,11 +148,10 @@ fn check_bit_mask(cx: &LateContext, bit_op: BinOp_, cmp_op: BinOp_, mask_value:
                                                mask_value,
                                                cmp_value));
                         }
-                    } else {
-                        if mask_value == 0 {
-                            span_lint(cx, BAD_BIT_MASK, *span, "&-masking with zero");
-                        }
+                    } else if mask_value == 0 {
+                        span_lint(cx, BAD_BIT_MASK, *span, "&-masking with zero");
                     }
+
                 }
                 BiBitOr => {
                     if mask_value | cmp_value != cmp_value {
@@ -177,10 +176,8 @@ fn check_bit_mask(cx: &LateContext, bit_op: BinOp_, cmp_op: BinOp_, mask_value:
                                   &format!("incompatible bit mask: `_ & {}` will always be lower than `{}`",
                                            mask_value,
                                            cmp_value));
-                    } else {
-                        if mask_value == 0 {
-                            span_lint(cx, BAD_BIT_MASK, *span, "&-masking with zero");
-                        }
+                    } else if mask_value == 0 {
+                        span_lint(cx, BAD_BIT_MASK, *span, "&-masking with zero");
                     }
                 }
                 BiBitOr => {
@@ -209,10 +206,8 @@ fn check_bit_mask(cx: &LateContext, bit_op: BinOp_, cmp_op: BinOp_, mask_value:
                                   &format!("incompatible bit mask: `_ & {}` will never be higher than `{}`",
                                            mask_value,
                                            cmp_value));
-                    } else {
-                        if mask_value == 0 {
-                            span_lint(cx, BAD_BIT_MASK, *span, "&-masking with zero");
-                        }
+                    } else if mask_value == 0 {
+                        span_lint(cx, BAD_BIT_MASK, *span, "&-masking with zero");
                     }
                 }
                 BiBitOr => {
diff --git a/src/consts.rs b/src/consts.rs
index 171ba6f27..68320705f 100644
--- a/src/consts.rs
+++ b/src/consts.rs
@@ -536,12 +536,10 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> {
                                                    Plus
                                                })
                                     .and_then(|ty| l64.checked_add(r64).map(|v| ConstantInt(v, ty)))
+                            } else if ln {
+                                add_neg_int(r64, rty, l64, lty)
                             } else {
-                                if ln {
-                                    add_neg_int(r64, rty, l64, lty)
-                                } else {
-                                    add_neg_int(l64, lty, r64, rty)
-                                }
+                                add_neg_int(l64, lty, r64, rty)
                             }
                         }
                         // TODO: float (would need bignum library?)
diff --git a/src/minmax.rs b/src/minmax.rs
index 2cce36f2a..e72f23920 100644
--- a/src/minmax.rs
+++ b/src/minmax.rs
@@ -59,12 +59,10 @@ fn min_max<'a>(cx: &LateContext, expr: &'a Expr) -> Option<(MinMax, Constant, &'
 
             if match_def_path(cx, def_id, &["core", "cmp", "min"]) {
                 fetch_const(args, Min)
+            } else if match_def_path(cx, def_id, &["core", "cmp", "max"]) {
+                fetch_const(args, Max)
             } else {
-                if match_def_path(cx, def_id, &["core", "cmp", "max"]) {
-                    fetch_const(args, Max)
-                } else {
-                    None
-                }
+                None
             }
         } else {
             None
diff --git a/src/shadow.rs b/src/shadow.rs
index 2d3e423ea..bcf3ce711 100644
--- a/src/shadow.rs
+++ b/src/shadow.rs
@@ -204,29 +204,28 @@ fn lint_shadow<T>(cx: &LateContext, name: Name, span: Span, lspan: Span, init: &
                                         snippet(cx, lspan, "_"),
                                         snippet(cx, expr.span, "..")));
             note_orig(cx, db, SHADOW_SAME, prev_span);
+        } else if contains_self(name, expr) {
+            let db = span_note_and_lint(cx,
+                                        SHADOW_REUSE,
+                                        lspan,
+                                        &format!("{} is shadowed by {} which reuses the original value",
+                                                 snippet(cx, lspan, "_"),
+                                                 snippet(cx, expr.span, "..")),
+                                                 expr.span,
+                                                 "initialization happens here");
+            note_orig(cx, db, SHADOW_REUSE, prev_span);
         } else {
-            if contains_self(name, expr) {
-                let db = span_note_and_lint(cx,
-                                            SHADOW_REUSE,
-                                            lspan,
-                                            &format!("{} is shadowed by {} which reuses the original value",
-                                                     snippet(cx, lspan, "_"),
-                                                     snippet(cx, expr.span, "..")),
-                                            expr.span,
-                                            "initialization happens here");
-                note_orig(cx, db, SHADOW_REUSE, prev_span);
-            } else {
-                let db = span_note_and_lint(cx,
-                                            SHADOW_UNRELATED,
-                                            lspan,
-                                            &format!("{} is shadowed by {}",
-                                                     snippet(cx, lspan, "_"),
-                                                     snippet(cx, expr.span, "..")),
-                                            expr.span,
-                                            "initialization happens here");
-                note_orig(cx, db, SHADOW_UNRELATED, prev_span);
-            }
+            let db = span_note_and_lint(cx,
+                                        SHADOW_UNRELATED,
+                                        lspan,
+                                        &format!("{} is shadowed by {}",
+                                                 snippet(cx, lspan, "_"),
+                                                 snippet(cx, expr.span, "..")),
+                                                 expr.span,
+                                                 "initialization happens here");
+            note_orig(cx, db, SHADOW_UNRELATED, prev_span);
         }
+
     } else {
         let db = span_lint(cx,
                            SHADOW_UNRELATED,