Pseudo-code, refactoring, fixed async dep.