Tidied up POMs