Small code reorganization in MV