Comments and some renaming