diff --git a/main.c b/main.c
index 30762a8..f0f2a51 100644
--- a/main.c
+++ b/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 int SetupServer(int* socket_fd, int port) {
-    printf("Starting Server\n");
+    printf("[Client] Starting Server\n");
     *socket_fd = socket(AF_INET, SOCK_STREAM, 0);
     struct sockaddr_in server_addr;
     server_addr.sin_family = AF_INET;
@@ -20,7 +20,7 @@ int SetupServer(int* socket_fd, int port) {
 
     int bound = bind(*socket_fd, (struct sockaddr*)&server_addr, sizeof(server_addr));
     if(bound < 0) {
-        printf("Bind error: %s (%i)\n", strerror(errno), errno);
+        printf("[Client] Bind error: %s (%i)\n", strerror(errno), errno);
         return -1;
     }
     listen(*socket_fd, 5);
@@ -35,11 +35,11 @@ int RemoveServer(int port) {
     server_addr.sin_addr.s_addr = inet_addr("127.0.0.1");   
     int connected = connect(socket_fd, (struct sockaddr*)&server_addr, sizeof(server_addr));
     if(connected < 0) {
-        printf("Connect error: %s (%i)\n", strerror(errno), errno);
+        printf("[Client] Connect error: %s (%i)\n", strerror(errno), errno);
         return -1;
     }
 
-    printf("Removing Server\n");
+    printf("[Client] Removing Server\n");
     char data[5];
     char flag = 0x1;
     u_int32_t nport = htonl(port);
@@ -47,7 +47,7 @@ int RemoveServer(int port) {
     memcpy(data+1, &nport, sizeof(u_int32_t));
     int bytes_sent = send(socket_fd, data, sizeof(data), 0);
     if(bytes_sent == -1) {
-        printf("Send error: %s (%i)\n", strerror(errno), errno);
+        printf("[Client] Send error: %s (%i)\n", strerror(errno), errno);
         return -1;
     }
     return 0;
@@ -57,15 +57,13 @@ int StartEnv(int port) {
     int socket_fd;
     int setup = SetupServer(&socket_fd, port);
     if(setup < 0) {
-        printf("Error setting up server\n");
+        printf("[Client] Error setting up server\n");
         return -1;
     }
 
-    printf("Waiting for connections\n");
     struct sockaddr_in client_addr;
     int client_size = sizeof(client_addr);
     int client_sock = accept(socket_fd, (struct sockaddr*)&client_addr, &client_size);
-    printf("Connection received\n");
 
     int obs_size = sizeof(struct Observation);
     struct SS13ArcadeEnv env;
@@ -75,7 +73,7 @@ int StartEnv(int port) {
         int bytes_received;
         bytes_received = recv(client_sock, buffer, sizeof(buffer), 0);
         if(bytes_received < 0) {
-            printf("Receive Error: %s (%d)\n", strerror(errno), errno);
+            printf("[Client] Receive Error: %s (%d)\n", strerror(errno), errno);
         } else if(bytes_received == 0) {
             break;
         }
@@ -87,13 +85,6 @@ int StartEnv(int port) {
             struct Observation obs;
             Step(&env, action, &obs);
 
-            //printf("Action: %i \n", action);
-            //printf("-- Observation --\n");
-            //printf("Player HP: %i Player MP: %i\n", obs.state.player_hp, obs.state.player_mp);
-            //printf("Enemy HP: %i Enemy MP: %i\n", obs.state.enemy_hp, obs.state.enemy_mp);
-            //printf("Steps: %i Reward: %i Done: %d\n", obs.state.steps, obs.reward, obs.done);
-            //printf("Action: %i\n", action);
-
             char data[obs_size];
             memcpy(&data, &obs, obs_size);
             send(client_sock, data, obs_size, 0);
@@ -114,7 +105,7 @@ int StartEnv(int port) {
 int main(int argc, char* argv[]) {
     int env = StartEnv(atoi(argv[1]));
     if(env < 0) {
-        printf("Error starting environment");
+        printf("[Client] Error starting environment");
         return 1;
     }
     return 0;