some comments, some renaming