Improved indenting and code layout.

Removed spaces. Indented correctly. Layed out multi-attribute tags a little better.
Merge pull request #415 from adrianblynch/patch-1

Improved indenting and code layout.