add comments and edit formatting