Further refactoring for operands