cleanup and handle integer operand expressions