- code clean up\n- resolved used of deprecated Async