updates from remi review
-commented lines
-indentation
-remove extra