cleanup
fix operator resolving