Tidied up both classes