renaming & adding comments