Cleaned up the disassembler code