removed one usage of OperatorDescriptor.getOperatorClass()
refactored a bit
operator is never null, no need to check
using operatorDescriptor
using operatorDescriptor