Refactor formats module. Add a DelimitedFormat class