Added guard, cleaned up spec