Using new initialisation helper and refactoring