Tidied up POM