cleanup
refactoring oeprator x
fix clone in