Tidy (mostly pom warnings)