More comments and renaming.