Refactor out DefaultFormatter (#35) (#56)