Clean up pom.xml ; reformat code to make clearer