Vince/refactor init