Format to ease merge