[vood] some refactors