Cleanup badly formatted xml
Code cleanup and formatting for #1029
Add new core dependencies to pom for #1029