Tidied up hierarchy