Cleaning up my operators