Refactored parsers (github issue #4)