Improved whitespace

There were lots of trailing spaces and mixed tabs/spaces in .XML, which looked really ugly in my editor.
The block closure '}' must be on else