Indents fixed
Comments and fine touches