Refactor initialisers