Extracted initialise to separate module