Fix style for code review and update pom.xml.