add comments and change names