Cleanup and organize pom.xml
Formatter