Clarification of comments and a little more code