Comments and few renaming