Improved indenting and code layout.

Removed spaces. Indented correctly. Layed out multi-attribute tags a little better.