Initialisation refactoring.