diff --git a/Startcode/input.c b/Startcode/input.c
index 2ad13fc..81b2433 100644
--- a/Startcode/input.c
+++ b/Startcode/input.c
@@ -12,16 +12,14 @@ static int createSingleWords(char text[MAX_LINE_LEN], char words[][MAX_WORD_LEN]
 int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
 {
     int wordCount = 0;
-    int i = 0;
     char lineRead[MAX_LINE_LEN];
 
-    while(fgets(lineRead, MAX_LINE_LEN, file) != NULL && i < maxWordCount)
+    while(fgets(lineRead, MAX_LINE_LEN, file) != NULL && wordCount < (int)maxWordCount)
     {
-        wordCount += createSingleWords(lineRead, words, maxWordCount);
-        i++;
+        wordCount += createSingleWords(lineRead, words + wordCount, maxWordCount - wordCount);
     }
 
-    return i; //wordCount
+    return wordCount; //wordCount
 }
 
 static int createSingleWords(char text[MAX_LINE_LEN], char words[][MAX_WORD_LEN], unsigned int maxWordCount)