Refactored initialisation code into separate Methods