Small cleaning and comments added