Refactor ElfParse