Tidied up class.