Slight tweaks and added comments
Changed Parser interface to be more consistent with FileReader