Cleanup; Split out operators