cleanup; refactor operation spec