Disassembler: More Code Cleanup and enhancements