[FEATURE] Commenting and cleansing

 - new comments
 - code was cleaned, made more readable
 - few minor problems were fixed