Refactor Vector a little