diff --git a/src/Handlers.php b/src/Handlers.php
index 89d0a40..36c38ea 100644
--- a/src/Handlers.php
+++ b/src/Handlers.php
@@ -1,6 +1,6 @@
 <?php
 
-require 'MessageHandler.php';
+require_once 'MessageHandler.php';
 
 class TestHandler implements MessageHandler
 {
diff --git a/src/entryPoint.php b/src/entryPoint.php
index 8b7cd03..3a75d92 100644
--- a/src/entryPoint.php
+++ b/src/entryPoint.php
@@ -10,7 +10,8 @@ define("INTER_ROOM", 111213);
 
 // randomorg($start,$end);
 
-require 'Handlers.php';
+require_once 'MessageHandler.php';
+require_once 'Handlers.php';
 
 $handlers = array(
     new TestHandler()
diff --git a/src/repl.php b/src/repl.php
index 00fcbf0..31a0e41 100644
--- a/src/repl.php
+++ b/src/repl.php
@@ -1,5 +1,5 @@
 <?php
-require 'entryPoint.php';
+require_once 'entryPoint.php';
 if(!defined("STDIN")) {
     define("STDIN", fopen('php://stdin','r'));
 }
@@ -9,9 +9,10 @@ $msg_id = 0;
 
 echo "Starting test REPL\n";
 do {
+    echo $msg_id, ' > ';
     $input = fread(STDIN, 80); // Read up to 80 characters or a newline
     $trimmed = trim($input);
 
-    echo $msg_id, ' > ' , reply_user($room_id, $msg_id, $trimmed) , "\n";
+    echo reply_user($room_id, $msg_id, $trimmed) , "\n";
     $msg_id++;
 } while($trimmed !== "exit");
\ No newline at end of file
diff --git a/test/Test.php b/test/Test.php
index b8fb36d..27307bd 100644
--- a/test/Test.php
+++ b/test/Test.php
@@ -7,7 +7,7 @@
  */
 
 use PHPUnit\Framework\TestCase;
-require '../src/entryPoint.php';
+require_once '../src/entryPoint.php';
 
 class Test extends TestCase
 {