Polishing on master.

Polishing some comments, some formating.