add comments/reformat