Tidied up object inheritance