Refactor formatters : replace single by item