Refactor of all formutil calls
Merge pull request #1409 from rojblake/formutil_removal

Refactor of formutil calls