-- Refactored Parser into methods