Fixed whitespace and modified comments