Improve comments, some renaming.