comments, rename some vars