diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index d0a6fb4..fe0f9c0 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -5,111 +5,109 @@ public class Main {
 		BaseData employee = new EmployeeData();
 		BaseData[] employees = new BaseData[5];
 		BaseData[] allData = new BaseData[11];
-		
+
 		allData[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		allData[1] = new EmployeeData("10001","高橋準","タカハシジュン","jtaka@hoge.jp","bbb","10");
-		allData[2] = new EmployeeData("10002","麻枝史明","マエダフミアキ","fmak@hoge.jp","ccc","11");
-		allData[3] = new EmployeeData("10003","丸戸章介","マルトショウスケ","marusyo@hoge.jp","ddd","12");
-		allData[4] = new EmployeeData("10004","三宅武","ミヤケタケシ","miya@hoge.jp","eee","13");
-		
-		DepartmentData dept  = new DepartmentData();
+		allData[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
+		allData[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+		allData[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
+		allData[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
+
+		DepartmentData dept = new DepartmentData();
 		dept.setIdDepartment("10");
 		dept.setNmDepartment("役員");
-		allData[5]=dept;
+		allData[5] = dept;
 		dept.setIdDepartment("11");
 		dept.setNmDepartment("人事・総務部");
-		dept= new DepartmentData();
-		allData[6]=dept;
+		dept = new DepartmentData();
+		allData[6] = dept;
 		dept.setIdDepartment("12");
 		dept.setNmDepartment("経理部");
-		allData[7]=dept;
-		dept= new DepartmentData();
+		allData[7] = dept;
+		dept = new DepartmentData();
 		dept.setIdDepartment("13");
 		dept.setNmDepartment("システム開発事業部");
-		allData[8]=dept;
-		dept= new DepartmentData();
+		allData[8] = dept;
+		dept = new DepartmentData();
 		dept.setIdDepartment("14");
 		dept.setNmDepartment("教育事業部");
-		allData[9]=dept;
-		dept= new DepartmentData();
+		allData[9] = dept;
+		dept = new DepartmentData();
 		dept.setIdDepartment("15");
 		dept.setNmDepartment("営業企画部");
-		allData[10]=dept;
-		
-		int emp=0;
-		int dep=0;
-		for(int i=0;i<allData.length;i++) {
-			if(allData[i] instanceof EmployeeData) {
-				emp++;
-			}
-			if(allData[i] instanceof DepartmentData) {
-				dep++;
+		allData[10] = dept;
+
+		for (int i = 0; i < allData.length; i++) {
+			if (allData[i] instanceof EmployeeData) {
+				EmployeeData emp = (EmployeeData) allData[i];
+
+				System.out.println(emp.getMailAddress());
 			}
 		}
-		System.out.println("社員データ："+emp+"件");
-		System.out.println("部署データ："+dep+"件");
-	
-		
-//		employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-//		employees[1] = new EmployeeData("10001","高橋準","タカハシジュン","jtaka@hoge.jp","bbb","10");
-//		employees[2] = new EmployeeData("10002","麻枝史明","マエダフミアキ","fmak@hoge.jp","ccc","11");
-//		employees[3] = new EmployeeData("10003","丸戸章介","マルトショウスケ","marusyo@hoge.jp","ddd","12");
-//		employees[4] = new EmployeeData("10004","三宅武","ミヤケタケシ","miya@hoge.jp","eee","13");
 
-//		System.out.println(employees[0].toCSV());
-//		System.out.println(employees[0].getPrimaryKeyValue());
+		//		int emp=0;
+		//		int dep=0;
+		//		for(int i=0;i<allData.length;i++) {
+		//			if(allData[i] instanceof EmployeeData) {
+		//				emp++;
+		//			}
+		//			if(allData[i] instanceof DepartmentData) {
+		//				dep++;
+		//			}
+		//		}
+		//		System.out.println("社員データ："+emp+"件");
+		//		System.out.println("部署データ："+dep+"件");
+
+		//		employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+		//		employees[1] = new EmployeeData("10001","高橋準","タカハシジュン","jtaka@hoge.jp","bbb","10");
+		//		employees[2] = new EmployeeData("10002","麻枝史明","マエダフミアキ","fmak@hoge.jp","ccc","11");
+		//		employees[3] = new EmployeeData("10003","丸戸章介","マルトショウスケ","marusyo@hoge.jp","ddd","12");
+		//		employees[4] = new EmployeeData("10004","三宅武","ミヤケタケシ","miya@hoge.jp","eee","13");
+
+		//		System.out.println(employees[0].toCSV());
+		//		System.out.println(employees[0].getPrimaryKeyValue());
 
 		Scanner sc = new Scanner(System.in);
-		
-	
+
 		for (int i = 0; i < employees.length; i++) {
 			System.out.println("検索したい社員IDを入力してください(終了する場合は0)");
 			String id = sc.nextLine();
 			boolean result = false;
-			
-			if(id.equals("0")) {
+
+			if (id.equals("0")) {
 				System.out.println("システムを終了します");
 				break;
 			}
 			if (employees[i].getPrimaryKeyValue().equals(id)) {
 				result = true;
 				employees[i].toString();
-				
+
+			}
+
+			if (result == false) {
+				System.out.println("該当する社員が見つかりませんでした");
 			}
-			
 
-		if(result==false) {
-			System.out.println("該当する社員が見つかりませんでした");
 		}
-		
-		}
-		}
-		
-
-
-
-
-		//		for(int i=0;i<5;i++) {
-		//			if(employee[i].getNmEmployee()==null) {
-		//				continue;
-		//			}
-		//			System.out.println(employee[i]);
-		//		}
-		//		
-		//		
-		//		
-		//		System.out.println("現在の社員データ数"+EmployeeData.getEmpCount());
-		//		
-		//		System.out.println(EmployeeData.COMPANY_NAME);
-
-		//		System.out.println();
-		//		System.out.println(employee.nmEmployee);
-		//		System.out.println(employee.knEmployee);
-		//		System.out.println(employee.mailAddress);
-		//		System.out.println(employee.password);
-		//		System.out.println(employee.idDepartment);
-
 	}
 
+	//		for(int i=0;i<5;i++) {
+	//			if(employee[i].getNmEmployee()==null) {
+	//				continue;
+	//			}
+	//			System.out.println(employee[i]);
+	//		}
+	//		
+	//		
+	//		
+	//		System.out.println("現在の社員データ数"+EmployeeData.getEmpCount());
+	//		
+	//		System.out.println(EmployeeData.COMPANY_NAME);
 
+	//		System.out.println();
+	//		System.out.println(employee.nmEmployee);
+	//		System.out.println(employee.knEmployee);
+	//		System.out.println(employee.mailAddress);
+	//		System.out.println(employee.password);
+	//		System.out.println(employee.idDepartment);
 
+}