Code cleanup for operators