Reorder and reformat in unix style.