more comments, renaming vars