Improved whitespace

There were lots of trailing spaces and mixed tabs/spaces in .XML, which looked really ugly in my editor.
Consider using a strict comparison operator instead of !=.