Tidying up specs