refactor, improve performance with euuid
minor refactor