Cleaned up the code quite a bit

Removed the logic from parseDataFile