more comments and renaming