Change logical order of initialization