improve the disassembly