Cosmetic: removed obsolete comments
Added some comments to a tricky part