Committing the inital xml style changes.

I only committed style changes here, so we should be able to merge it into the master branch without hurting the java logic.