Removing extra junk, adding comments: