add comments and rename