Polishing - factoring out the Vector class