adding comments, changing names