Commenting and remove excess whitespace