diff --git a/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java b/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java
index 0a6ef2c..dcb547c 100644
--- a/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java
+++ b/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java
@@ -23,7 +23,7 @@
     private LayoutInflater inflater;
     private final int itemLayoutId;
     private final List<String> memberList;
-    private final List<Member> dcList;
+    private final List<Member> allList;
     private List<Integer> redTeam = new ArrayList<>();
     private List<Integer> blueTeam = new ArrayList<>();
     private List<Integer> grayTeam = new ArrayList<>();
@@ -35,13 +35,12 @@
     final int grayColor = Color.rgb(172, 172, 172);
 
     public MemberListAdapter(Context context, int itemLayoutId,
-                             List<String> members, List<Member> mn) {
+                             List<String> members, List<Member> mm) {
         super(context, 0);
-        this.inflater = (LayoutInflater) context.getSystemService(
-                Context.LAYOUT_INFLATER_SERVICE);
+        this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         this.itemLayoutId = itemLayoutId;
         this.memberList = members;
-        this.dcList = mn;
+        this.allList = mm;
 
     }
 
@@ -68,10 +67,10 @@
             grayTeam.clear();
             masterTeam.clear();
             spyTeam.clear();
-            for(int i = 0 ; i < dcList.size();i++){
-                if(dcList.get(i).getBelongs().equals("r")) {
+            for(int i = 0 ; i < allList.size();i++){
+                if(allList.get(i).getBelongs().equals("r")) {
                     redTeam.add(i);
-                }else if(dcList.get(i).getBelongs().equals("b")) {
+                }else if(allList.get(i).getBelongs().equals("b")) {
                     blueTeam.add(i);
                 }else{
                     grayTeam.add(i);
@@ -88,8 +87,8 @@
 
 
             holder.imageView.setVisibility(View.GONE);
-            for(int i = 0 ; i < dcList.size();i++){
-                if(dcList.get(i).getMaster()) {
+            for(int i = 0 ; i < allList.size();i++){
+                if(allList.get(i).getMaster()) {
                     masterTeam.add(i);
                 }else{
                     spyTeam.add(i);
@@ -111,13 +110,6 @@
         holder.textView.setText(memberList.get(position));
 
         return convertView;
-/*
-        View root = mLayoutInflater.inflate(R.layout.activity_member_room, null);
-
-        String item = getItem(position);
-
-        root.setBackgroundColor(redColor);
-*/
 
     }
 
diff --git a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
index 5c5043c..03b494d 100644
--- a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
@@ -38,12 +38,10 @@
 
 public class MemberRoomActivity extends AppCompatActivity {
 
-    //RoomViewModel roomViewModel = new ViewModelProvider(this).get(RoomViewModel.class);
-
     //フィールド
     ArrayList<String> viewMembers = new ArrayList<>();
     ArrayList<String> oldMembers = new ArrayList<>();
-    List<Member> gMembers = new ArrayList<>();
+    List<Member> allMembers = new ArrayList<>();
     String roomId = "null";
     String myName = "null";
 
@@ -78,7 +76,7 @@
 
         ListView membersList = (ListView) findViewById(R.id.MembersList);
 
-        BaseAdapter adapter = new MemberListAdapter(this.getApplicationContext(), R.layout.member_list_layout, viewMembers, gMembers);
+        BaseAdapter adapter = new MemberListAdapter(this.getApplicationContext(), R.layout.member_list_layout, viewMembers, allMembers);
         membersList.setAdapter(adapter);
 
         //LiveData(List<Member>)への購読
@@ -89,9 +87,9 @@
 
                 viewMembers.clear();
                 irisMembers.forEach(m -> viewMembers.add(m.getNickname()));
-                gMembers = irisMembers;
+                allMembers = irisMembers;
 
-                BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers, gMembers);
+                BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers, allMembers);
                 membersList.setAdapter(adapter);
 
             }
@@ -157,6 +155,7 @@
             }
         });
 
+        //roomIDをクリップボードにコピー、他アプリに共有
         copyButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -166,6 +165,7 @@
             }
         });
 
+        //部屋の退出、最初の画面（ホーム）に戻る
         homeButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -190,10 +190,11 @@
 
     }
 
+    //---------------------------------------------------------------
+    //roomIDのテキストをコピーする処理
     public void CopyClipBoard() {
-        String copyText = roomId; // 作成したレース結果を取得
+        String copyText = roomId; // 生成されたroomIDを取得
 
-        // クリップボードへの格納成功時は成功メッセージをトーストで表示
         boolean result = SetClipData(copyText);
         if(result) {
 
@@ -236,11 +237,14 @@
             Intent sendIntent =new Intent();
             sendIntent.setAction(Intent.ACTION_SEND);
             sendIntent.setType("text/plain");
-            sendIntent.putExtra(sendIntent.EXTRA_TEXT, item.getText());   // メモ帳のテキスト欄、メールアプリの本文にテキストをセット
+            sendIntent.putExtra(sendIntent.EXTRA_TEXT, item.getText());   // 他アプリのテキストをセット
             startActivity(sendIntent);                                    // 共有メニューを開く
         }
     }
+    //---------------------------------------------------------------
 
+    //---------------------------------------------------------------
+    //ホームボタンを押したときの処理
     private void homeButton(RoomViewModel roomViewModel){
         String strTitle = "ホーム画面に戻ってよろしいですか？";
         String strMessage = "退出することになりますよ";
@@ -249,7 +253,7 @@
         builder = new AlertDialog.Builder(this);
         builder.setMessage(strMessage);
         builder.setTitle(strTitle);
-        builder.setPositiveButton("ok", new DialogInterface.OnClickListener() {
+        builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 roomViewModel.deleteMember(roomId , myName);
@@ -267,6 +271,8 @@
         builder.show();
     }
 
+    //---------------------------------------------------------------
+    //オーナーが部屋を退出し、強制的に部屋が削除される処理
     private void roomDeleted(RoomViewModel roomViewModel){
         String strTitle = "オーナーが退出しました";
         String strMessage = "強制的に部屋を削除します";
diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
index bb12093..a5cfaed 100644
--- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
@@ -43,7 +43,7 @@
     //フィールド
     ArrayList<String> viewMembers = new ArrayList<>();
     ArrayList<String> oldMembers = new ArrayList<>();
-    List<Member> gMembers = new ArrayList<>();
+    List<Member> allMembers = new ArrayList<>();
     String roomId = "null";
     String myName = "null";
     //String nickname;
@@ -104,7 +104,7 @@
 
         ListView membersList = (ListView) findViewById(R.id.MembersList);
 
-        BaseAdapter adapter = new MemberListAdapter(this.getApplicationContext(), R.layout.member_list_layout, viewMembers, gMembers);
+        BaseAdapter adapter = new MemberListAdapter(this.getApplicationContext(), R.layout.member_list_layout, viewMembers, allMembers);
         membersList.setAdapter(adapter);
 
         //LiveData(List<Member>)への購読
@@ -115,9 +115,9 @@
 
                 viewMembers.clear();
                 irisMembers.forEach(m -> viewMembers.add(m.getNickname()));
-                gMembers = irisMembers;
+                allMembers = irisMembers;
 
-                BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers, gMembers);
+                BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers, allMembers);
                 membersList.setAdapter(adapter);
 
             }
@@ -211,7 +211,7 @@
 
         //---------------------------------------------------------------
         //settings情報
-        String s = "設定\\nお絵描き";
+        String s = "設定";
         TextView settingsText = findViewById(R.id.settings);
         settingsText.setText(s);
 
@@ -266,7 +266,8 @@
         //クリップボードからClipDataを取得
         ClipData cd = cm.getPrimaryClip();
 
-        if(cd != null) {  // クリップボードにコピーがある場合
+        if(cd != null) {
+            // クリップボードにコピーがある場合
             ClipData.Item item = cd.getItemAt(0);
             Intent sendIntent =new Intent();
             sendIntent.setAction(Intent.ACTION_SEND);