- Refactorred initialization.