diff --git a/src/server/slave.c b/src/server/slave.c
--- a/src/server/slave.c
+++ b/src/server/slave.c
@@ -18,15 +18,6 @@
 
  */
 
-/*
- * **********************************************************************************
- * Slave functions / etc resides below. Wouldn't a separate file make this easier??
- *
- * Slave listens on server for a command in the format of each function...
- * We need if's for returns... ==> watchdog
- * **********************************************************************************
-*/
-
 // Provides DISTREN_REQUEST* which is in reality, DISTREN_SEND(signal) in the minds of your average joe
 #include "protocol.h"
 #include "options.h" // Confuse, etc.
@@ -40,7 +31,6 @@ int slavestatus = 0; // Ugh global vars
 int main(int argc, char *argv[])
 {
 
-
 int counter;
 
 /* Parses arguments, skips if there are no args */
@@ -83,7 +73,6 @@ for(counter=0; counter<argc; counter++){
 /* End arg parser */
 
 
-
 /* Option getter: Creates vars to grab stuff from conf, uses the options include to grab this data */
 char *username;
 username = NULL;
@@ -97,7 +86,7 @@ options_init(argc,argv,&my_cfg, myopts, 
 /* End option getter */
 
 
-/* If there's no key or username in the conf, or if they're at the default (!key/!username) let the user know! */
+/* Notifies the user if there is no username in the conf file */
 	if(username == NULL || strcmp(username, "!username") == 0 ){
 	  fprintf(stderr, "\nYou didn't register!\nPlease register or edit your config. (see -h)\nIf this error persists, check distrenslave.conf to ensure all items are filled.\n");
 	}
@@ -107,16 +96,15 @@ options_init(argc,argv,&my_cfg, myopts, 
 			fprintf(stderr,"You should now be logged into distren.\n");
 		}
 		else{
-			fprintf(stderr,"Login failed. I have no clue why. Goodbye.\n");
+			fprintf(stderr,"Login failed. I have no clue why. Sorry.\n");
 			return 0;
 		}
 	}
 	else{
-	  fprintf(stderr,"Something is terribly wrong!!!");
+	  fprintf(stderr,"Something is terribly wrong!");
 	}
 
 
-
 /* Somewhat pseudo Rendering code */
 /*
 	if('slave recieves "start frame#, job#"'){