tidied up specs