Adding some comments, some renaming.