Vince/refactor