more virtenv refactor