diff --git a/java/String-3/gHappy.java b/java/String-3/gHappy.java
index 364c58c..6b53488 100644
--- a/java/String-3/gHappy.java
+++ b/java/String-3/gHappy.java
@@ -1,16 +1,12 @@
 public boolean gHappy(String str) {
-  int len = str.length();
-  boolean happy = true;
-
-  for (int i = 0; i < len; i++) {
+  if (str.length() == 1) return false;
+  for (int i = 0; i<str.length(); ++i)
     if (str.charAt(i) == 'g') {
-      if (i > 0 && str.charAt(i-1) == 'g')
-        happy = true;
-      else if (i < len-1 && str.charAt(i+1) == 'g')
-        happy = true;
-      else
-        happy = false;
+      if (i>0 && i<str.length()-1 && str.charAt(i-1) != 'g' &&
+        str.charAt(i+1) != 'g')
+        return false;
+      if (i == str.length()-1 && str.charAt(i-1) != 'g')
+        return false;
     }
-  }
-  return happy;
+  return true;
 }