Changing structure to remove init()