Cleanup, nits, make some thing sync that were async