Reformat to standards