Shuffle some code into init()