proper format and remove extra white space.

proper format and remove extra white space.