Minor cleanup
Removed unused file
Moved parsing to separate file. Added some comments
Added some inline function documentation