diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/InputUserPresenter.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/InputUserPresenter.java
index 495fcc3..a42b6dc 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/InputUserPresenter.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/InputUserPresenter.java
@@ -15,7 +15,7 @@
 public class InputUserPresenter implements UserLoginBoundary {
     private String userID;
     private String userPass;
-    FragmentActivity fragmentActivity;
+    private FragmentActivity fragmentActivity;
 
 
     public InputUserPresenter(FragmentActivity fragmentActivity, EditText userName, EditText passWord) {
@@ -27,10 +27,8 @@
     public void inputData() {
         if (userID.isEmpty()) {
             Toast.makeText(fragmentActivity, "ユーザー名が未記入です", Toast.LENGTH_SHORT).show();
-            return;
         } else if (userPass.isEmpty()) {
             Toast.makeText(fragmentActivity, "パスワードが未記入です", Toast.LENGTH_SHORT).show();
-            return;
         }
     }
 
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginController.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginController.java
index 966e19f..5ed5744 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginController.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginController.java
@@ -33,7 +33,7 @@
 
     private CactusConnection loginConnection;
     private FragmentActivity fragmentActivity;
-    UserLoginControllerBoundary userLoginControllerBoundary;
+    private UserLoginControllerBoundary userLoginControllerBoundary;
 
 
     public UserLoginController(FragmentActivity fragmentActivity, FragmentManager fragmentManager, UserLoginControllerBoundary userLoginControllerBound) {
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginUseCases.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginUseCases.java
index 9e928ff..7b1dc9c 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginUseCases.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginUseCases.java
@@ -15,7 +15,7 @@
 
     private String userID;
     private String userPass;
-    CactusUserEntity cactusUserEntity;
+    private CactusUserEntity cactusUserEntity;
 
     public UserLoginUseCases(UserLoginBoundary userLoginBound) {
         this.userLoginBoundary = userLoginBound;
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java
index 387edbf..5c939ba 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java
@@ -44,8 +44,8 @@
         loginButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                EditText userName = (EditText) getActivity().findViewById(R.id.inputUserName);
-                EditText passWord = (EditText) getActivity().findViewById(R.id.checkPassword);
+                EditText userName = getActivity().findViewById(R.id.inputUserName);
+                EditText passWord = getActivity().findViewById(R.id.checkPassword);
                 FragmentActivity fragmentActivity = getActivity();
                 FragmentManager manager = getFragmentManager();
 
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
index 9c11369..5b0b2cf 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
@@ -24,8 +24,7 @@
     private SignUpFragmentConnection connection;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.sign_up_fragment, container, false);
     }
@@ -36,7 +35,7 @@
         super.onStart();
 
         //ログインボタン
-        Button button = (Button) getActivity().findViewById(R.id.LoginButton2);
+        Button button = getActivity().findViewById(R.id.LoginButton2);
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -51,16 +50,15 @@
         });
 
         //サインアップ
-        Button signUpButton = (Button) getActivity().findViewById(R.id.signUp2);
+        Button signUpButton = getActivity().findViewById(R.id.signUp2);
 
         signUpButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                EditText inputPassword = (EditText) getActivity().findViewById(R.id.inputPassword2);
-                EditText checkPassWord = (EditText) getActivity().findViewById(R.id.checkPassword);
-                EditText inputUserName = (EditText) getActivity().findViewById(R.id.inputUserName);
-                EditText inputUserID = (EditText) getActivity().findViewById(R.id.inputUserID);
-
+                EditText inputPassword = getActivity().findViewById(R.id.inputPassword2);
+                EditText checkPassWord = getActivity().findViewById(R.id.checkPassword);
+                EditText inputUserName = getActivity().findViewById(R.id.inputUserName);
+                EditText inputUserID = getActivity().findViewById(R.id.inputUserID);
 
                 if (inputUserID.getText().toString().contains(" ") || inputUserID.getText().toString().contains("　")) {
                     Toast.makeText(getActivity(), "空白の含むIDは登録できません", Toast.LENGTH_SHORT).show();
@@ -76,7 +74,7 @@
                     return;
                 }
 
-                /**
+                /*
                  * 以下通信、
                  * 役割Controller
                  */
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java
index 0f6e5a2..4a1d317 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java
@@ -16,8 +16,7 @@
 public class StartFragment extends Fragment {
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.fragment_start, container, false);
     }