Some comments and renaming