Name conventions, asyncification of most functions