Refactor Vector