renaming and a few comments

to keep my sanity