Continue code clean up for operator