refactor mve