Tidying up the POM