Cleaned up spec.