Move #initialize code to #restart