Minor refactor and finalize async flow