Major cleanup on aisle 'metric spaces'