refactor demangler