Some minor renaming & improvements of comments. Modifications are completely transparent (no change in behaviour).