refactor, add and use pevt/deps