Refactoring

Get rid of ugly switch in intruction operands