Tidied up spec