Tidied up class names