STP: just comments and renaming.