minor commenting and renaming