Adding first pass of refactoring the Format class