Reformat expand fn