diff --git a/StringCheck/src/StringCheck.java b/StringCheck/src/StringCheck.java
index f542795..4788c4b 100644
--- a/StringCheck/src/StringCheck.java
+++ b/StringCheck/src/StringCheck.java
@@ -21,7 +21,7 @@ public class StringCheck {
 
 			System.out.println(classNames[0]);
 			str = scan.nextLine();
-			
+
 			// 前後の空白を除去した文字列
 			String trimmed = str.strip();
 
@@ -41,20 +41,19 @@ public class StringCheck {
 			if (isEmpty) {
 				System.out.println(classNames[1]);
 				continue;
-			} else if (isOverLimit) {
+			}
+			if (isOverLimit) {
 				System.out.println(classNames[2]);
 				continue;
-			} else {
-				break;
 
 			}
-		}
+			System.out.println();
+			System.out.println(classNames[3]);
+			//読み込んだ文字列の前後にある空白文字を除去
+			System.out.println(str.strip());
+			break;
 
-		System.out.println();
-		System.out.println(classNames[3]);
-		//読み込んだ文字列の前後にある空白文字を除去
-		System.out.println(str.strip());
-		scan.close();
+		}
 
 	}