Refactored parsing logic in proper class
Parser in own class