[TASK] updates initialisation, some refactoring