Remove extra space.
Add new lines everywhere.
More style cleanup.