Tidying spec a little