Move around and simplify the code for initialization