Quick refactor of FormParser