POM tidy and update