code refactoring & add escopo list data ready