ELF(): refactoring and improve performance