add comments and reformat xml