add comments & format