Refactor de-parea initialization