format/units restructuration