Cleaned up operators