Refactoring for the new field foramtter.
Working on the tests and the new formatter.