Cosmetic changes

+ Add some indentations
+ Replace "//" by "#" for comments