Made Vector follow coding guidelines