Addition of comments, clarification of names