Formatted everything.

I have formatted in Eclipse, using your formatter.xml