Added formatting and cleanup xmls.

So our code style is the same making it uniform and consistent. Also
makes the diffs looks better.