diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java
index 7f2e750..b160d4b 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Room.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Room.java
@@ -50,7 +50,8 @@
 
         public List<Member> getMembers() {
 
-            return new ArrayList<Member>(members.values());
+                List<Member> memberslist = new ArrayList<Member>(members.values()) ;
+                return memberslist;
 
         }
 
@@ -120,7 +121,8 @@
         }
 
         public Member getMember(String nick) {
-            return members.get(nick);
+                Member m = members.get(nick);
+                return m;
         }
 
         public void addMember(String nick){
@@ -132,13 +134,15 @@
                 return 0;
         }
 
+        public Room(){
+                drawingTimer = false;
+                drawingTimerTimes = 0;
+                gameTimer = true;
+                gameTimerTimes = 30;
+                gameTimerFirstThinkingTimes = 10;
+        }
 
         public Room(String rid, String owner) {
-            drawingTimer = false;
-            drawingTimerTimes = 0;
-            gameTimer = true;
-            gameTimerTimes = 30;
-            gameTimerFirstThinkingTimes = 10;
                 this.rid=rid;
                 ownerName=owner;
         }
diff --git a/src/main/java/com/ntlab/irisserver/models/RoomManager.java b/src/main/java/com/ntlab/irisserver/models/RoomManager.java
index 0ad8cf7..e3fef6e 100644
--- a/src/main/java/com/ntlab/irisserver/models/RoomManager.java
+++ b/src/main/java/com/ntlab/irisserver/models/RoomManager.java
@@ -12,14 +12,14 @@
     private static RoomManager theInstance = null;
     private Map<String, Room> rooms = new HashMap<String, Room>();
 
-    public static RoomManager getInstance(){
-        if(theInstance == null){
+    public static RoomManager getInstance() {
+        if(theInstance == null) {
             theInstance = new RoomManager();
         }
         return theInstance;
     }
 
-    public Room createRoom(String owner){
+    public Room createRoom(String owner) {
         UUID uuid = UUID.randomUUID();
         String rid = uuid.toString(); //uuid型からstring型に変換
         Room r = new Room(rid, owner);
@@ -27,12 +27,12 @@
         return r;
     }
 
-    public Room getRoom(String rid){
+    public Room getRoom(String rid) {
         Room r = rooms.get(rid);
         return r;
     }
 
-    public void deleteRoom(String rid){
+    public void deleteRoom(String rid) {
         rooms.remove(rid);
     }