add comments, rename