Cleanup spec a bit