Operand refactoring
adding comments
encapsulation of classes