refactor .el