rearrange the init stuff a bit