Starting to refactor parsing for custom formatters