[UPDATE] Add Comments and additional Infos for Readability