Tidied up features pom