More renaming & documentation of the code