Refactoring initialisation process
Refactoring