Tidied up specs