WIP: op is used instead of cur_op

[NikeNano]

Description

This should not have any changes on the implementation other than cleaning up a potential typo and making the code more consistent.

Checklist

• [x] I am familiar with the Contributing Guidelines.
• [x] New or existing tests cover these changes.
• [x] The documentation is up to date with these changes.