general code cleanup & disassembler class addition