minor comments, renaming