Refactoring EV a bit