vector refactoring