modified comments and whitespace