Switch to use promises where possible

I kinda prefer to leave this white-spaces in, because they separate different logical blocks of initialization. Makes it harder for me to reason about it without them.