refactor and escape executoins