some renaming and comments