Code cleaning, modified comments