Made Parser a bit more managable
Changed file in main