Fixed some formatting issues.

Added line breaks in places and removed some extra whitespace.