diff --git a/mbhd-core/src/main/java/org/multibit/hd/core/extensions/WalletTypeExtension.java b/mbhd-core/src/main/java/org/multibit/hd/core/extensions/WalletTypeExtension.java
index 0febcf894..05c770454 100644
--- a/mbhd-core/src/main/java/org/multibit/hd/core/extensions/WalletTypeExtension.java
+++ b/mbhd-core/src/main/java/org/multibit/hd/core/extensions/WalletTypeExtension.java
@@ -84,9 +84,7 @@ public boolean equals(Object o) {
 
     WalletTypeExtension that = (WalletTypeExtension) o;
 
-    if (walletType != that.walletType) return false;
-
-    return true;
+    return walletType == that.walletType;
   }
 
   @Override
diff --git a/mbhd-core/src/main/java/org/multibit/hd/core/protobuf/MBHDContactsProtos.java b/mbhd-core/src/main/java/org/multibit/hd/core/protobuf/MBHDContactsProtos.java
index a8089aa71..e83aeead1 100644
--- a/mbhd-core/src/main/java/org/multibit/hd/core/protobuf/MBHDContactsProtos.java
+++ b/mbhd-core/src/main/java/org/multibit/hd/core/protobuf/MBHDContactsProtos.java
@@ -415,11 +415,7 @@ public Builder mergeFrom(org.multibit.hd.core.protobuf.MBHDContactsProtos.Tag ot
       }
 
       public final boolean isInitialized() {
-        if (!hasTagValue()) {
-          
-          return false;
-        }
-        return true;
+        return hasTagValue();
       }
 
       public Builder mergeFrom(
diff --git a/mbhd-core/src/main/java/org/multibit/hd/core/protobuf/MBHDPaymentsProtos.java b/mbhd-core/src/main/java/org/multibit/hd/core/protobuf/MBHDPaymentsProtos.java
index 1a0ca6cb8..2ee5a90be 100644
--- a/mbhd-core/src/main/java/org/multibit/hd/core/protobuf/MBHDPaymentsProtos.java
+++ b/mbhd-core/src/main/java/org/multibit/hd/core/protobuf/MBHDPaymentsProtos.java
@@ -741,11 +741,7 @@ public final boolean isInitialized() {
           
           return false;
         }
-        if (!hasCurrency()) {
-          
-          return false;
-        }
-        return true;
+        return hasCurrency();
       }
 
       public Builder mergeFrom(
diff --git a/mbhd-core/src/main/java/org/multibit/hd/core/utils/OSUtils.java b/mbhd-core/src/main/java/org/multibit/hd/core/utils/OSUtils.java
index 88596ea8d..f7bccb25a 100644
--- a/mbhd-core/src/main/java/org/multibit/hd/core/utils/OSUtils.java
+++ b/mbhd-core/src/main/java/org/multibit/hd/core/utils/OSUtils.java
@@ -107,15 +107,8 @@ public static boolean isUnix() {
     final String os = getOsName().toLowerCase();
 
     // XXX: this obviously needs some more work to be "true" in general (see bottom of file)
-    if ((os.contains("sunos")) || (os.contains("linux"))) {
-      return true;
-    }
-
-    if (isMac() && (System.getProperty("os.version", "").startsWith("10."))) {
-      return true;
-    }
+    return (os.contains("sunos")) || (os.contains("linux")) || isMac() && (System.getProperty("os.version", "").startsWith("10."));
 
-    return false;
   }
 
   /**