reverted structure to preferred format