Indentation and comments corrections

Corrections of indentation according to the Code Conventions document
and few comments.