cleaned up opcode_handlers a little