Reformat to make display code clearer