diff --git a/flask/testapp/static/javascript/beautyVote.js b/flask/testapp/static/javascript/beautyVote.js
index f3b8c9a..7f515d9 100644
--- a/flask/testapp/static/javascript/beautyVote.js
+++ b/flask/testapp/static/javascript/beautyVote.js
@@ -68,7 +68,7 @@
         
         case WAIT_START:
             WaitStart();
-            if(timer > 10){
+            if(timer > 5){
                 timer = 0;
                 CheckStart();// 他のプレイヤーが名前を書き終わるのを待機
             }
@@ -239,22 +239,26 @@
             if(xhr.responseText=="WAIT"){
                 console.log(xhr.responseText);
             }
-            //正解選択肢を取得(全ての計算を取得)
+            //正解選択肢を取得(選択が多い順に表示)
             else{
                 timer = 0;
                 console.log(xhr.responseText);
                 answerTable = xhr.responseText
                 let splitAnswer = answerTable.split("\n");
-                let arr_answer1 = splitAnswer[0].split(" "); // 空白で文字列を分割
+                // 1番目に多かった答えと人数
+                let arr_answer1 = splitAnswer[0].split(" "); 
                 question[round].answer1 = arr_answer1[0];
                 question[round].people1 = arr_answer1[1];
-                let arr_answer2 = splitAnswer[1].split(" "); // 空白で文字列を分割
+                // 2番目に多かった答えと人数
+                let arr_answer2 = splitAnswer[1].split(" "); 
                 question[round].answer2 = arr_answer2[0];
                 question[round].people2 = arr_answer2[1];
-                let arr_answer3 = splitAnswer[2].split(" "); // 空白で文字列を分割
+                // 3番目に多かった答えと人数
+                let arr_answer3 = splitAnswer[2].split(" "); 
                 question[round].answer3 = arr_answer3[0];
                 question[round].people3 = arr_answer3[1];
-                let arr_answer4 = splitAnswer[3].split(" "); // 空白で文字列を分割
+                // 4番目に多かった答えと人数
+                let arr_answer4 = splitAnswer[3].split(" "); 
                 question[round].answer4 = arr_answer4[0];
                 question[round].people4 = arr_answer4[1];
                 console.log(question[round].answer4)
@@ -309,10 +313,6 @@
 var C = 2;
 var D = 3;
 var E = 4;
-var first = 0;
-var second = 1;
-var third = 2;
-var forth = 3;
 
 
 var CORRECT = 1;
@@ -329,12 +329,6 @@
 
 var orderTable = "";
 
-
-var my_order = 8;
-var ranking_order = ["ルフィ", "ゾロ", "ジンベエ", "サンジ", "ロビン", "ウソップ", "フランキー", "ブルック", "ナミ", "チョッパー"]
-var scoreing_order = [3000000000,1110000000, 1100000000, 1032000000, 930000000, 500000000, 394000000, 383000000, 366000000, 1000]
-var MAX_ORDER = 10;
-
 var question = new Array(MAX_ROUND);
 for(var i = 0; i < MAX_ROUND+1; i ++){
     question[i] = new Question();
diff --git a/flask/testapp/static/javascript/resultScreen.js b/flask/testapp/static/javascript/resultScreen.js
index ddf67b1..dd9d573 100644
--- a/flask/testapp/static/javascript/resultScreen.js
+++ b/flask/testapp/static/javascript/resultScreen.js
@@ -113,7 +113,7 @@
 
 }
 
-// 他のプレイヤーが名前を書くのを待機
+// 他のプレイヤーが名前を書くのを待機(nemoto変更)
 function WaitStart(){
     fill("silver");
 
diff --git a/flask/testapp/views.py b/flask/testapp/views.py
index 6483d94..4e47696 100644
--- a/flask/testapp/views.py
+++ b/flask/testapp/views.py
@@ -160,11 +160,11 @@
         max = MAX_PLAYER
 
     for i in range(max):
-        if i + j >= max:  # 参照する配列がない時
+        if i + j >= max:  # 参照する配列がこれ以上ない時
             break
         order_table += str(i + 1 + j) + "位" + " " + user[int(labels[i + j])] + " " + str(scores[i + j]) + "pt" + "\n"
         now_order = i + 1 + j  # 今の順位
-        if i + j + 1 == max:  # 先ほど挿入した配列が，最後であった時
+        if i + j + 1 == max:  # 先ほどorder_tableに挿入した配列が，最後であった時
             break
         # 同じスコアのplayersの処理
         while str(scores[i + j]) == str(scores[i + 1 + j]):
@@ -172,7 +172,7 @@
             order_table += (
                 str(now_order) + "位" + " " + user[int(labels[i + j])] + " " + str(scores[i + j]) + "pt" + "\n"
             )
-            if i + j + 1 >= max:  # 参照する配列がない時
+            if i + j + 1 >= max:  # (i+j)と比較する配列(i+j+1)がない時
                 break
 
     if order_table.endswith("\n"):