modified comments and whitespaces