Index: branches/FEPSimulator/NetworkReader.cpp
===================================================================
--- branches/FEPSimulator/NetworkReader.cpp	(revision 84)
+++ branches/FEPSimulator/NetworkReader.cpp	(revision 86)
@@ -1,8 +1,4 @@
 #include "NetworkReader.h"
 
-/**
- * Constructor
- * @param networkFileName input xml file
- */
 NetworkReader::NetworkReader(const char * xml) {
     ldsIndex = 0;
@@ -11,30 +7,23 @@
 
 LOOP * NetworkReader::parseLoop(TiXmlElement * loopElem) {
-        LOOP *loop = new LOOP;
+    LOOP *loop = new LOOP;
 
-        TiXmlElement *subLoopElem = loopElem->FirstChildElement();
-        loop->loopID = atoi(subLoopElem->GetText());
-        subLoopElem = subLoopElem->NextSiblingElement();
-        loop->loop_loc = (char *) subLoopElem->GetText();
-        subLoopElem = subLoopElem->NextSiblingElement();
-        loop->vol = atoi(subLoopElem->GetText());
-        subLoopElem = subLoopElem->NextSiblingElement();
-        loop->occ = atof(subLoopElem->GetText());
-        subLoopElem = subLoopElem->NextSiblingElement();
-        loop->spd = atof(subLoopElem->GetText());
-        
-        return loop;
+    TiXmlElement *subLoopElem = loopElem->FirstChildElement();
+    loop->loopID = atoi(subLoopElem->GetText());
+    subLoopElem = subLoopElem->NextSiblingElement();
+    loop->loop_loc = (char *) subLoopElem->GetText();
+    subLoopElem = subLoopElem->NextSiblingElement();
+    loop->vol = atoi(subLoopElem->GetText());
+    subLoopElem = subLoopElem->NextSiblingElement();
+    loop->occ = atof(subLoopElem->GetText());
+    subLoopElem = subLoopElem->NextSiblingElement();
+    loop->spd = atof(subLoopElem->GetText());
+
+    return loop;
 }
 
-/**
- * Parses a station xml element into an "STATION"
- * 
- * @param stationElem the station xml element
- * @param the parent line
- * @return the new station
- */
 STATION * NetworkReader::parseStation(TiXmlElement *stationElem, FEP_LINE *line) {
     STATION *station = new STATION;
-    
+
     TiXmlElement *stationSubElem = stationElem->FirstChildElement();
     station->lds = atol(stationSubElem->GetText());
@@ -56,5 +45,5 @@
 
     station->pos = 0; // NOT SURE WHY WE NEED THIS?
-    
+
     // Add loops to station
     TiXmlElement *loopElem = stationSubElem->NextSiblingElement()->FirstChildElement();
@@ -68,13 +57,8 @@
     cout << station->loops.size() << endl;
     station->dataPack = DataPacker::packData(station);
-    
+
     return station;
 }
 
-/**
- * Parses a "Line" xml element into an FEP_LINE
- * @param lineElem the xml element
- * @return FEP_LINE
- */
 FEP_LINE * NetworkReader::parseLine(TiXmlElement * lineElem) {
     FEP_LINE *line = new FEP_LINE;
@@ -104,12 +88,8 @@
 }
 
-/**
- * Loads FEPLines from a specified xml file
- * @param networkFileName the input xml file
- */
 void NetworkReader::loadLines(const char * xml) {
     // Load network xml file
     TiXmlDocument doc;
-    doc.Parse((const char*)xml, 0, TIXML_ENCODING_UTF8);
+    doc.Parse((const char*) xml, 0, TIXML_ENCODING_UTF8);
 
     // grab <Network> element
@@ -126,8 +106,4 @@
 }
 
-/**
- * Getter for lines
- * @return List of FEP_LINES
- */
 vector<FEP_LINE*> NetworkReader::getLines() {
 
@@ -135,8 +111,4 @@
 }
 
-/**
- * Getter for stations
- * @return List of STATIONs
- */
 vector<STATION*> NetworkReader::getStations() {