Cleanup and formatting of pom.xml
- Also, minor correction to messages.yml